Merge pull request #1816 from meshtastic/wifi-disconnect-fix

If wifi credentials ever go stale, dump them.

src/mesh/http/ContentHandler.cpp

@@ -79,8 +79,8 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleHotspot);
 
     ResourceNode *nodeAdmin = new ResourceNode("/admin", "GET", &handleAdmin);
-    ResourceNode *nodeAdminSettings = new ResourceNode("/admin/settings", "GET", &handleAdminSettings);
-    ResourceNode *nodeAdminSettingsApply = new ResourceNode("/admin/settings/apply", "POST", &handleAdminSettingsApply);
+    //    ResourceNode *nodeAdminSettings = new ResourceNode("/admin/settings", "GET", &handleAdminSettings);
+    //    ResourceNode *nodeAdminSettingsApply = new ResourceNode("/admin/settings/apply", "POST", &handleAdminSettingsApply);
     //    ResourceNode *nodeAdminFs = new ResourceNode("/admin/fs", "GET", &handleFs);
     //    ResourceNode *nodeUpdateFs = new ResourceNode("/admin/fs/update", "POST", &handleUpdateFs);
     //    ResourceNode *nodeDeleteFs = new ResourceNode("/admin/fs/delete", "GET", &handleDeleteFsContent);
@@ -113,8 +113,8 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     //    secureServer->registerNode(nodeDeleteFs);
     secureServer->registerNode(nodeAdmin);
     //    secureServer->registerNode(nodeAdminFs);
-    secureServer->registerNode(nodeAdminSettings);
-    secureServer->registerNode(nodeAdminSettingsApply);
+    //    secureServer->registerNode(nodeAdminSettings);
+    //    secureServer->registerNode(nodeAdminSettingsApply);
     secureServer->registerNode(nodeRoot); // This has to be last
 
     // Insecure nodes
@@ -134,8 +134,8 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     //    insecureServer->registerNode(nodeDeleteFs);
     insecureServer->registerNode(nodeAdmin);
     //    insecureServer->registerNode(nodeAdminFs);
-    insecureServer->registerNode(nodeAdminSettings);
-    insecureServer->registerNode(nodeAdminSettingsApply);
+    //    insecureServer->registerNode(nodeAdminSettings);
+    //    insecureServer->registerNode(nodeAdminSettingsApply);
     insecureServer->registerNode(nodeRoot); // This has to be last
 }
 
@@ -694,8 +694,8 @@ void handleAdmin(HTTPRequest *req, HTTPResponse *res)
     res->setHeader("Access-Control-Allow-Methods", "GET");
 
     res->println("<h1>Meshtastic</h1>\n");
-    res->println("<a href=/admin/settings>Settings</a><br>\n");
-    res->println("<a href=/admin/fs>Manage Web Content</a><br>\n");
+    //    res->println("<a href=/admin/settings>Settings</a><br>\n");
+    //    res->println("<a href=/admin/fs>Manage Web Content</a><br>\n");
     res->println("<a href=/json/report>Device Report</a><br>\n");
 }
 

src/mesh/http/WiFiAPClient.cpp

@@ -43,40 +43,25 @@ bool APStartupComplete = 0;
 
 static bool needReconnect = true; // If we create our reconnector, run it once at the beginning
 
-// FIXME, veto light sleep if we have a TCP server running
-#if 0
-class WifiSleepObserver : public Observer<uint32_t> {
-protected:
-
-    /// Return 0 if sleep is okay
-    virtual int onNotify(uint32_t newValue) {
-
-    }
-};
-
-static WifiSleepObserver wifiSleepObserver;
-//preflightSleepObserver.observe(&preflightSleep);
-#endif
-
 static int32_t reconnectWiFi()
 {
     const char *wifiName = config.network.wifi_ssid;
     const char *wifiPsw = config.network.wifi_psk;
 
     if (config.network.wifi_enabled && needReconnect && !WiFi.isConnected()) {
-        // if (radioConfig.has_preferences && needReconnect && !WiFi.isConnected()) {
-
+        
         if (!*wifiPsw) // Treat empty password as no password
             wifiPsw = NULL;
 
         if (*wifiName) {
             needReconnect = false;
 
+            // Make sure we clear old connection credentials
+            WiFi.disconnect(false, true);
+
             DEBUG_MSG("... Reconnecting to WiFi access point\n");
             WiFi.mode(WIFI_MODE_STA);
             WiFi.begin(wifiName, wifiPsw);
-
-            // Starting timeClient;
         }
     }