sync gold 1.979 staging

config/config.json

@@ -58,6 +58,9 @@
       "file_path": "./routing/routing_plugin.js",
       "config_path": "routing",
       "category": "routing",
+      "config": {
+        "smooth_failover": true
+      },
       "init_seq": 5
     },
     {

platform/goldpro/platform.sh

@@ -1,4 +1,10 @@
 NETWORK_SETUP=yes
+NEED_FIRESTATUS=true
+BLUETOOTH_TIMEOUT=3600
+
+function get_pppoe_rps_cpus {
+  echo "e"
+}
 
 function run_horse_light {
   flash_interval=${1:-2}

platform/platform.sh

@@ -4,7 +4,7 @@ FW_PLATFORM_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 UNAME=$(uname -m)
 NETWORK_SETUP=yes
-BLUETOOTH_TIMEOUT=0
+BLUETOOTH_TIMEOUT=3600
 
 function run_horse_light {
   return

plugins/hostapd/hostapd_plugin.js

@@ -97,6 +97,10 @@ class HostapdPlugin extends Plugin {
       }
       parameters.bridge = this.networkConfig.bridge;
     }
+    if (platform.wifiSD && !await r.verifyPermanentMAC(this.name)) {
+      this.log.error(`Permanent MAC address of ${this.name} is not valid, ignore it`);
+      return;
+    }
 
     if (params.ht_capab && !Array.isArray(params.ht_capab)) delete params.ht_capab
 

plugins/interface/intf_base_plugin.js

@@ -921,7 +921,7 @@ class InterfaceBasePlugin extends Plugin {
 
     const dnsResult = await this.getDNSResult(u.hostname).catch((err) => false);
     if(!dnsResult) {
-      this.log.error("failed to resolve dns on domain", u.hostname);
+      this.log.error("failed to resolve dns on domain", u.hostname, 'on', this.name);
       delete this.isHttpTesting[defaultTestURL];
       return null;
     }
@@ -1174,7 +1174,7 @@ class InterfaceBasePlugin extends Plugin {
       }
 
       const result = await Promise.any(promises).catch((err) => {
-        this.log.error("no valid dns from any nameservers", err.message);
+        this.log.error("no valid dns from any nameservers on", this.name, err.message);
         return null;
       });
       return result;

plugins/interface/wlan_intf_plugin.js

@@ -148,6 +148,14 @@ class WLANInterfacePlugin extends InterfaceBasePlugin {
     return true;
   }
 
+  async apply() {
+    if (platform.wifiSD && !await r.verifyPermanentMAC(this.name)) {
+      this.log.error(`Permanent MAC address of ${this.name} is not valid, ignore it`);
+      return;
+    }
+    await super.apply();
+  }
+
   async flush() {
     await super.flush();
 

plugins/plugin.js

@@ -30,7 +30,7 @@ class Plugin {
 
   init(pluginConfig) {
     this.pluginConfig = pluginConfig;
-    this.log.info(`Initializing Plugin ${this.constructor.name}...`);
+    this.log.info(`Initializing Plugin ${this.constructor.name} ${JSON.stringify(pluginConfig)}...`);
   }
 
   configure(networkConfig) {

plugins/plugin_loader.js

@@ -69,7 +69,7 @@ async function initPlugins() {
   log.info("Plugin initialized", pluginConfs);
 }
 
-function createPluginInstance(category, name, constructor) {
+function createPluginInstance(category, name, constructor, config=null) {
   let instance = pluginCategoryMap[category] && pluginCategoryMap[category][name];
   if (instance)
     return instance;
@@ -83,6 +83,9 @@ function createPluginInstance(category, name, constructor) {
   instance = new constructor(name);
   instance.name = name;
   pluginCategoryMap[category][name] = instance;
+  if (config) {
+    instance.init(config);
+  }
   log.info("Instance created", instance.name);
   return instance;
 }
@@ -179,7 +182,7 @@ async function reapply(config, dryRun = false) {
         }
         if (value) {
           for (let name in value) {
-            const instance = createPluginInstance(pluginConf.category, name, pluginConf.c);
+            const instance = createPluginInstance(pluginConf.category, name, pluginConf.c, pluginConf.config);
             if (!instance)
               continue;
             instance._mark = 1;