Ensure that we get all events

Author: me-no-dev

Diff for: libraries/Network/src/NetworkInterface.cpp

@@ -671,7 +671,10 @@ IPAddress NetworkInterface::globalIPv6() const
 
 size_t NetworkInterface::printTo(Print & out) const {
     size_t bytes = 0;
-    bytes += out.print(esp_netif_get_desc(_esp_netif));
+    const char * dscr = esp_netif_get_desc(_esp_netif);
+    if(dscr != NULL){
+        bytes += out.print(dscr);
+    }
     bytes += out.print(":");
     if(esp_netif_is_netif_up(_esp_netif)){
         bytes += out.print(" <UP");

Diff for: libraries/WiFi/src/STA.cpp

@@ -294,9 +294,13 @@ bool STAClass::onEnable(){
         return false;
     }
     if(_esp_netif == NULL){
-        Network.onSysEvent(_onStaArduinoEvent);
         _esp_netif = get_esp_interface_netif(ESP_IF_WIFI_STA);
+        if(_esp_netif == NULL){
+            log_e("STA was enabled, but netif is NULL???");
+            return false;
+        }
         /* attach to receive events */
+        Network.onSysEvent(_onStaArduinoEvent);
         initNetif(ESP_NETIF_ID_STA);
     }
     return true;

Diff for: libraries/WiFi/src/WiFiGeneric.cpp

@@ -476,24 +476,25 @@ bool WiFiGenericClass::mode(wifi_mode_t m)
     if(((m & WIFI_MODE_STA) != 0) && ((cm & WIFI_MODE_STA) == 0)){
         // we are enabling STA interface
         WiFi.STA.onEnable();
-    } else if(((m & WIFI_MODE_STA) == 0) && ((cm & WIFI_MODE_STA) != 0)){
-        // we are disabling STA interface
-        WiFi.STA.onDisable();
     }
-
     if(((m & WIFI_MODE_AP) != 0) && ((cm & WIFI_MODE_AP) == 0)){
         // we are enabling AP interface
         WiFi.AP.onEnable();
-    } else if(((m & WIFI_MODE_AP) == 0) && ((cm & WIFI_MODE_AP) != 0)){
-        // we are disabling AP interface
-        WiFi.AP.onDisable();
     }
 
     if(cm && !m){
         // Turn OFF WiFi
         if(!espWiFiStop()){
             return false;
         }
+        if((cm & WIFI_MODE_STA) != 0){
+            // we are disabling STA interface
+            WiFi.STA.onDisable();
+        }
+        if((cm & WIFI_MODE_AP) != 0){
+            // we are disabling AP interface
+            WiFi.AP.onDisable();
+        }
         Network.removeEvent(_eventCallback);
         return true;
     }
@@ -511,6 +512,16 @@ bool WiFiGenericClass::mode(wifi_mode_t m)
         log_e("Could not set mode! %d", err);
         return false;
     }
+
+    if(((m & WIFI_MODE_STA) == 0) && ((cm & WIFI_MODE_STA) != 0)){
+        // we are disabling STA interface (but AP is ON)
+        WiFi.STA.onDisable();
+    }
+    if(((m & WIFI_MODE_AP) == 0) && ((cm & WIFI_MODE_AP) != 0)){
+        // we are disabling AP interface (but STA is ON)
+        WiFi.AP.onDisable();
+    }
+
     if(_long_range){
         if(m & WIFI_MODE_STA){
             err = esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR);