feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Fixing static IP configuration so it doesn't get overwritten by DHCP as part of WiFi.begin(). (#4103)

Browse Source 
Fixing DHCP client stop if WiFi.config() is called before WiFi.begin() (as done in WiFiClientStaticIP.ino)
This commit is contained in:
Mike Dunston
2020-06-22 03:59:51 -07:00
committed by me-no-dev
parent cf713a88c8
commit 06125d22e1
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/WiFi/src/WiFiGeneric.cpp
View File

@ -91,6 +91,11 @@ esp_err_t set_esp_interface_ip(esp_interface_t interface, IPAddress local_ip=IPA
info.gw.addr = static_cast<uint32_t>(gateway); info.gw.addr = static_cast<uint32_t>(gateway);
info.netmask.addr = static_cast<uint32_t>(subnet); info.netmask.addr = static_cast<uint32_t>(subnet);
log_v("Configuring %s static IP: " IPSTR ", MASK: " IPSTR ", GW: " IPSTR,
interface == ESP_IF_WIFI_STA ? "Station" :
interface == ESP_IF_WIFI_AP ? "SoftAP" : "Ethernet",
IP2STR(&info.ip), IP2STR(&info.netmask), IP2STR(&info.gw));
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
if(interface != ESP_IF_WIFI_AP){ if(interface != ESP_IF_WIFI_AP){
err = esp_netif_dhcpc_get_status(esp_netif, &status); err = esp_netif_dhcpc_get_status(esp_netif, &status);
@ -99,7 +104,7 @@ esp_err_t set_esp_interface_ip(esp_interface_t interface, IPAddress local_ip=IPA
return err; return err;
} }
err = esp_netif_dhcpc_stop(esp_netif); err = esp_netif_dhcpc_stop(esp_netif);
if(err){ if(err && err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED){
log_e("DHCPC Stop Failed! 0x%04x", err); log_e("DHCPC Stop Failed! 0x%04x", err);
return err; return err;
} }
@ -122,7 +127,7 @@ esp_err_t set_esp_interface_ip(esp_interface_t interface, IPAddress local_ip=IPA
return err; return err;
} }
err = esp_netif_dhcps_stop(esp_netif); err = esp_netif_dhcps_stop(esp_netif);
if(err){ if(err && err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED){
log_e("DHCPS Stop Failed! 0x%04x", err); log_e("DHCPS Stop Failed! 0x%04x", err);
return err; return err;
} }

1
libraries/WiFi/src/WiFiSTA.cpp
View File

@ -308,6 +308,7 @@ bool WiFiSTAClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subne
if(err == ESP_OK){ if(err == ESP_OK){
err = set_esp_interface_dns(ESP_IF_WIFI_STA, dns1, dns2); err = set_esp_interface_dns(ESP_IF_WIFI_STA, dns1, dns2);
} }
_useStaticIp = err == ESP_OK;
return err == ESP_OK; return err == ESP_OK;
} }