Merge pull request #1208 from jasonlyc/bug_fix

only need to renew DHCP lease on DHCP wan carrier change
firewalla · Feb 1, 2024 · fb7102b · fb7102b
2 parents 00f7a1c + c485405
commit fb7102b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/plugins/interface/intf_base_plugin.js b/plugins/interface/intf_base_plugin.js
@@ -1301,10 +1301,18 @@ class InterfaceBasePlugin extends Plugin {
           this._wanConnState = this._wanConnState || { ready: true, successCount: OFF_ON_THRESHOLD - 1, failureCount: 0 };
           this._wanConnState.successCount = OFF_ON_THRESHOLD - 1;
           this._wanConnState.failureCount = ON_OFF_THRESHOLD - 1;
-          // WAN interface plugged, need to reapply WAN interface config
+          // WAN interface plugged, need to restart dhcp client if applicable
           if (this.isDHCP()) {
-            this.propagateConfigChanged(true);
-            pl.scheduleReapply();
+            if (this.networkConfig.dhcp) {
+              this.flushIP(4).then(() => this.renewDHCPLease()).catch((err) => {
+                this.log.error(`Failed to renew DHCP lease on interface ${this.name}`, err.message);
+              });
+            }
+            if (this.networkConfig.dhcp6) {
+              this.flushIP(6).then(() => this.renewDHCP6Lease()).catch((err) => {
+                this.log.error(`Failed to renew DHCPv6 lease on interface ${this.name}`, err.message);
+              });
+            }
           }
         }
         break;