Merge pull request #1273 from firewalla/master

firewalla · May 31, 2024 · 21a531d · 21a531d
2 parents dc1100c + a6f8a1f
commit 21a531d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/platform/gold/bin/firereset b/platform/gold/bin/firereset
diff --git a/platform/gold/platform.sh b/platform/gold/platform.sh
@@ -1,4 +1,5 @@
 NETWORK_SETUP=yes
+BLUETOOTH_TIMEOUT=3600
 
 function run_horse_light {
   flash_interval=${1:-2}

diff --git a/plugins/routing/routing_plugin.js b/plugins/routing/routing_plugin.js
@@ -308,7 +308,7 @@ class RoutingPlugin extends Plugin {
               await routing.addRouteToTable(dnsIP, gw, intf, routing.RT_GLOBAL_DEFAULT, metric, 4).catch((err) => {
                 this.log.warn(`fail to add route -4 ${dnsIP} via ${gw} dev ${intf} table ${routing.RT_GLOBAL_DEFAULT}, err:`, err.message)});
               await routing.addRouteToTable(dnsIP, gw, intf, "main", metric, 4).then(() => {
-                this._updateDnsRouteCache(dnsIP, gw, viaIntf, metric, "main");
+                this._updateDnsRouteCache(dnsIP, gw, intf, metric, "main");
               }).catch((err) => {
                 this.log.warn(`fail to add route -4 ${dnsIP} via ${gw} dev ${intf} table main, err:`, err.message)});
             }
@@ -417,7 +417,8 @@ class RoutingPlugin extends Plugin {
     // async context and apply/flush context should be mutually exclusive, so they acquire the same LOCK_SHARED
     await lock.acquire(inAsyncContext ? LOCK_SHARED : LOCK_APPLY_ACTIVE_WAN, async () => {
       // flush global default routing table, no need to touch global static routing table here
-      if (this.pluginConfig && this.pluginConfig.smooth_failover) {
+      const type = this.networkConfig.default.type || "single";
+      if (type === 'primary_standby' && this.pluginConfig && this.pluginConfig.smooth_failover) {
         const deadWANIntfs = this.getUnreadyWANPlugins();
         await this._removeDeviceRouting(deadWANIntfs, routing.RT_GLOBAL_DEFAULT, af);
         await this._removeDeviceRouting(deadWANIntfs, routing.RT_GLOBAL_LOCAL, af);
@@ -428,11 +429,10 @@ class RoutingPlugin extends Plugin {
         await routing.flushRoutingTable(routing.RT_GLOBAL_LOCAL, af);
       }
 
-      if (!this.pluginConfig || !this.pluginConfig.smooth_failover) {
+      if (type !== 'primary_standby' || !this.pluginConfig || !this.pluginConfig.smooth_failover) {
         await this._removeMainRoutes(af);
       }
 
-      const type = this.networkConfig.default.type || "single";
       switch (type) {
         case "single":
         case "primary_standby": {
@@ -966,9 +966,9 @@ class RoutingPlugin extends Plugin {
         const intfPlugin = this._wanStatus[intf] && this._wanStatus[intf].plugin
         const type = (this.networkConfig && this.networkConfig.default && this.networkConfig.default.type) || "single";
 
-        if (this.pluginConfig && this.pluginConfig.smooth_failover) {
+        if (type === 'primary_standby' && this.pluginConfig && this.pluginConfig.smooth_failover) {
           // update global default routes related to the interface
-          if (intfPlugin && type == 'primary_standby' && this.name == 'global') {
+          if (intfPlugin && this.name == 'global') {
             this.refreshGlobalIntfRoutes(intf, 4);
             break;
           }