Ensure that Static IP configuration for network interfaces is kept until STOP (espressif#9445)

me-no-dev · web-flow · commit e4a57854a636 · 2024-04-02T19:18:46.000+03:00
diff --git a/libraries/Ethernet/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp
@@ -107,7 +107,7 @@ void ETHClass::_onEthEvent(int32_t event_id, void* event_data){
     } else if (event_id == ETHERNET_EVENT_STOP) {
         log_v("%s Stopped", desc());
         arduino_event.event_id = ARDUINO_EVENT_ETH_STOP;
-        clearStatusBits(ESP_NETIF_STARTED_BIT | ESP_NETIF_CONNECTED_BIT | ESP_NETIF_HAS_IP_BIT | ESP_NETIF_HAS_LOCAL_IP6_BIT | ESP_NETIF_HAS_GLOBAL_IP6_BIT);
+        clearStatusBits(ESP_NETIF_STARTED_BIT | ESP_NETIF_CONNECTED_BIT | ESP_NETIF_HAS_IP_BIT | ESP_NETIF_HAS_LOCAL_IP6_BIT | ESP_NETIF_HAS_GLOBAL_IP6_BIT | ESP_NETIF_HAS_STATIC_IP_BIT);
     }
 
     if(arduino_event.event_id < ARDUINO_EVENT_MAX){
diff --git a/libraries/Network/src/NetworkInterface.cpp b/libraries/Network/src/NetworkInterface.cpp
@@ -281,7 +281,7 @@ bool NetworkInterface::connected() const {
 }
 
 bool NetworkInterface::hasIP() const {
-    return (getStatusBits() & ESP_NETIF_HAS_IP_BIT) != 0;
+    return (getStatusBits() & (ESP_NETIF_HAS_IP_BIT | ESP_NETIF_HAS_STATIC_IP_BIT)) != 0;
 }
 
 bool NetworkInterface::hasLinkLocalIPv6() const {
@@ -451,7 +451,7 @@ bool NetworkInterface::config(IPAddress local_ip, IPAddress gateway, IPAddress s
             return false;
         }
 
-        clearStatusBits(ESP_NETIF_HAS_IP_BIT);
+        clearStatusBits(ESP_NETIF_HAS_IP_BIT | ESP_NETIF_HAS_STATIC_IP_BIT);
 
         // Set IPv4, Netmask, Gateway
         err = esp_netif_set_ip_info(_esp_netif, &info);
@@ -473,7 +473,7 @@ bool NetworkInterface::config(IPAddress local_ip, IPAddress gateway, IPAddress s
                 return false;
             }
         } else {
-            setStatusBits(ESP_NETIF_HAS_IP_BIT);
+            setStatusBits(ESP_NETIF_HAS_STATIC_IP_BIT);
         }
     }
 
diff --git a/libraries/Network/src/NetworkInterface.h b/libraries/Network/src/NetworkInterface.h
@@ -27,6 +27,7 @@ static const int ESP_NETIF_HAS_IP_BIT           = BIT2;
 static const int ESP_NETIF_HAS_LOCAL_IP6_BIT    = BIT3;
 static const int ESP_NETIF_HAS_GLOBAL_IP6_BIT   = BIT4;
 static const int ESP_NETIF_WANT_IP6_BIT         = BIT5;
+static const int ESP_NETIF_HAS_STATIC_IP_BIT    = BIT6;
 
 #define ESP_NETIF_ID_ETH ESP_NETIF_ID_ETH0
 
diff --git a/libraries/WiFi/src/STA.cpp b/libraries/WiFi/src/STA.cpp
@@ -213,7 +213,7 @@ void STAClass::_onStaEvent(int32_t event_id, void* event_data){
     } else if (event_id == WIFI_EVENT_STA_STOP) {
         log_v("STA Stopped");
         arduino_event.event_id = ARDUINO_EVENT_WIFI_STA_STOP;
-        clearStatusBits(ESP_NETIF_STARTED_BIT | ESP_NETIF_CONNECTED_BIT | ESP_NETIF_HAS_IP_BIT | ESP_NETIF_HAS_LOCAL_IP6_BIT | ESP_NETIF_HAS_GLOBAL_IP6_BIT);
+        clearStatusBits(ESP_NETIF_STARTED_BIT | ESP_NETIF_CONNECTED_BIT | ESP_NETIF_HAS_IP_BIT | ESP_NETIF_HAS_LOCAL_IP6_BIT | ESP_NETIF_HAS_GLOBAL_IP6_BIT | ESP_NETIF_HAS_STATIC_IP_BIT);
     } else if (event_id == WIFI_EVENT_STA_AUTHMODE_CHANGE) {
         #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
             wifi_event_sta_authmode_change_t * event = (wifi_event_sta_authmode_change_t*)event_data;
@@ -355,7 +355,7 @@ bool STAClass::connect(){
         return false;
     }
 
-    if((getStatusBits() & ESP_NETIF_HAS_IP_BIT) == 0 && !config()){
+    if((getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) == 0 && !config()){
         log_e("STA failed to configure dynamic IP!");
         return false;
     }
@@ -426,7 +426,7 @@ bool STAClass::connect(const char* ssid, const char *passphrase, int32_t channel
         return false;
     }
 
-    if((getStatusBits() & ESP_NETIF_HAS_IP_BIT) == 0 && !config()){
+    if((getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) == 0 && !config()){
         log_e("STA failed to configure dynamic IP!");
         return false;
     }
diff --git a/libraries/WiFi/src/WiFiSTA.cpp b/libraries/WiFi/src/WiFiSTA.cpp
@@ -177,7 +177,7 @@ bool WiFiSTAClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subne
         subnet = (tmp != INADDR_NONE) ? tmp : IPAddress(255, 255, 255, 0);
     }
 
-    return STA.config(local_ip, gateway, subnet, dns1, dns2);
+    return STA.begin() && STA.config(local_ip, gateway, subnet, dns1, dns2);
 }
 
 bool WiFiSTAClass::config(IPAddress local_ip, IPAddress dns) {
@@ -205,10 +205,7 @@ bool WiFiSTAClass::config(IPAddress local_ip, IPAddress dns) {
  */
 bool WiFiSTAClass::setDNS(IPAddress dns1, IPAddress dns2)
 {
-    if(!STA.started()){
-        return false;
-    }
-    return STA.dnsIP(0, dns1) && STA.dnsIP(1, dns2);
+    return STA.begin() && STA.dnsIP(0, dns1) && STA.dnsIP(1, dns2);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ void ETHClass::_onEthEvent(int32_t event_id, void* event_data){`
`107`	`107`	`} else if (event_id == ETHERNET_EVENT_STOP) {`
`108`	`108`	`log_v("%s Stopped", desc());`
`109`	`109`	`arduino_event.event_id = ARDUINO_EVENT_ETH_STOP;`
`110`		`- clearStatusBits(ESP_NETIF_STARTED_BIT \| ESP_NETIF_CONNECTED_BIT \| ESP_NETIF_HAS_IP_BIT \| ESP_NETIF_HAS_LOCAL_IP6_BIT \| ESP_NETIF_HAS_GLOBAL_IP6_BIT);`
	`110`	`+ clearStatusBits(ESP_NETIF_STARTED_BIT \| ESP_NETIF_CONNECTED_BIT \| ESP_NETIF_HAS_IP_BIT \| ESP_NETIF_HAS_LOCAL_IP6_BIT \| ESP_NETIF_HAS_GLOBAL_IP6_BIT \| ESP_NETIF_HAS_STATIC_IP_BIT);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if(arduino_event.event_id < ARDUINO_EVENT_MAX){`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ bool NetworkInterface::connected() const {`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`bool NetworkInterface::hasIP() const {`
`284`		`- return (getStatusBits() & ESP_NETIF_HAS_IP_BIT) != 0;`
	`284`	`+ return (getStatusBits() & (ESP_NETIF_HAS_IP_BIT \| ESP_NETIF_HAS_STATIC_IP_BIT)) != 0;`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`bool NetworkInterface::hasLinkLocalIPv6() const {`
`@@ -451,7 +451,7 @@ bool NetworkInterface::config(IPAddress local_ip, IPAddress gateway, IPAddress s`
`451`	`451`	`return false;`
`452`	`452`	`}`
`453`	`453`
`454`		`- clearStatusBits(ESP_NETIF_HAS_IP_BIT);`
	`454`	`+ clearStatusBits(ESP_NETIF_HAS_IP_BIT \| ESP_NETIF_HAS_STATIC_IP_BIT);`
`455`	`455`
`456`	`456`	`// Set IPv4, Netmask, Gateway`
`457`	`457`	`err = esp_netif_set_ip_info(_esp_netif, &info);`
`@@ -473,7 +473,7 @@ bool NetworkInterface::config(IPAddress local_ip, IPAddress gateway, IPAddress s`
`473`	`473`	`return false;`
`474`	`474`	`}`
`475`	`475`	`} else {`
`476`		`- setStatusBits(ESP_NETIF_HAS_IP_BIT);`
	`476`	`+ setStatusBits(ESP_NETIF_HAS_STATIC_IP_BIT);`
`477`	`477`	`}`
`478`	`478`	`}`
`479`	`479`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ void STAClass::_onStaEvent(int32_t event_id, void* event_data){`
`213`	`213`	`} else if (event_id == WIFI_EVENT_STA_STOP) {`
`214`	`214`	`log_v("STA Stopped");`
`215`	`215`	`arduino_event.event_id = ARDUINO_EVENT_WIFI_STA_STOP;`
`216`		`- clearStatusBits(ESP_NETIF_STARTED_BIT \| ESP_NETIF_CONNECTED_BIT \| ESP_NETIF_HAS_IP_BIT \| ESP_NETIF_HAS_LOCAL_IP6_BIT \| ESP_NETIF_HAS_GLOBAL_IP6_BIT);`
	`216`	`+ clearStatusBits(ESP_NETIF_STARTED_BIT \| ESP_NETIF_CONNECTED_BIT \| ESP_NETIF_HAS_IP_BIT \| ESP_NETIF_HAS_LOCAL_IP6_BIT \| ESP_NETIF_HAS_GLOBAL_IP6_BIT \| ESP_NETIF_HAS_STATIC_IP_BIT);`
`217`	`217`	`} else if (event_id == WIFI_EVENT_STA_AUTHMODE_CHANGE) {`
`218`	`218`	`#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE`
`219`	`219`	`wifi_event_sta_authmode_change_t * event = (wifi_event_sta_authmode_change_t*)event_data;`
`@@ -355,7 +355,7 @@ bool STAClass::connect(){`
`355`	`355`	`return false;`
`356`	`356`	`}`
`357`	`357`
`358`		`- if((getStatusBits() & ESP_NETIF_HAS_IP_BIT) == 0 && !config()){`
	`358`	`+ if((getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) == 0 && !config()){`
`359`	`359`	`log_e("STA failed to configure dynamic IP!");`
`360`	`360`	`return false;`
`361`	`361`	`}`
`@@ -426,7 +426,7 @@ bool STAClass::connect(const char* ssid, const char *passphrase, int32_t channel`
`426`	`426`	`return false;`
`427`	`427`	`}`
`428`	`428`
`429`		`- if((getStatusBits() & ESP_NETIF_HAS_IP_BIT) == 0 && !config()){`
	`429`	`+ if((getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) == 0 && !config()){`
`430`	`430`	`log_e("STA failed to configure dynamic IP!");`
`431`	`431`	`return false;`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ bool WiFiSTAClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subne`
`177`	`177`	`subnet = (tmp != INADDR_NONE) ? tmp : IPAddress(255, 255, 255, 0);`
`178`	`178`	`}`
`179`	`179`
`180`		`- return STA.config(local_ip, gateway, subnet, dns1, dns2);`
	`180`	`+ return STA.begin() && STA.config(local_ip, gateway, subnet, dns1, dns2);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`bool WiFiSTAClass::config(IPAddress local_ip, IPAddress dns) {`
`@@ -205,10 +205,7 @@ bool WiFiSTAClass::config(IPAddress local_ip, IPAddress dns) {`
`205`	`205`	`*/`
`206`	`206`	`bool WiFiSTAClass::setDNS(IPAddress dns1, IPAddress dns2)`
`207`	`207`	`{`
`208`		`- if(!STA.started()){`
`209`		`- return false;`
`210`		`- }`
`211`		`- return STA.dnsIP(0, dns1) && STA.dnsIP(1, dns2);`
	`208`	`+ return STA.begin() && STA.dnsIP(0, dns1) && STA.dnsIP(1, dns2);`
`212`	`209`	`}`
`213`	`210`
`214`	`211`	`/**`