Skip to content

fix switching to static address with lwip2 #6026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 1, 2019
Merged

fix switching to static address with lwip2 #6026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eed76e2
fix switching to static address with lwip2
d-a-v Apr 30, 2019
6826b42
add comments
d-a-v Apr 30, 2019
4b85b7c
documentation: It is more natural to set an IP address before startin…
d-a-v Apr 30, 2019
1fe0d19
Merge branch 'master' into staticip
devyte Apr 30, 2019
16b4a62
Merge branch 'master' into staticip
devyte May 1, 2019
d4c332f
Merge branch 'master' into staticip
d-a-v May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/esp8266wifi/station-class.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ The following IP configuration may be provided:
Serial.println();

Serial.printf("Connecting to %s\n", ssid);
WiFi.begin(ssid, password);
WiFi.config(staticIP, gateway, subnet);
WiFi.begin(ssid, password);
while (WiFi.status() != WL_CONNECTED)
{
delay(500);
Expand Down
27 changes: 27 additions & 0 deletions libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,27 @@ wl_status_t ESP8266WiFiSTAClass::begin() {
* @param dns1 Static DNS server 1
* @param dns2 Static DNS server 2
*/

#if LWIP_VERSION_MAJOR != 1
/*
About the following call in the end of ESP8266WiFiSTAClass::config():
netif_set_addr(eagle_lwip_getif(STATION_IF), &info.ip, &info.netmask, &info.gw);

With lwip2, it is needed to trigger IP address change.
Recall: when lwip2 is enabled, lwip1 api is still used by espressif firmware
https://github.com/d-a-v/esp82xx-nonos-linklayer/tree/25d5e8186f710a230221021cba97727dbfdfd953#how-it-works

We need first to disable the lwIP API redirection for netif_set_addr() so lwip1's call will be linked:
https://github.com/d-a-v/esp82xx-nonos-linklayer/blob/25d5e8186f710a230221021cba97727dbfdfd953/glue-lwip/arch/cc.h#L122

We also need to declare its prototype using ip4_addr_t instead of ip_addr_t because lwIP-1.x never has IPv6.
No need to worry about this #undef, this call is only needed in lwip2, and never used in arduino core code.
*/
#undef netif_set_addr // need to call lwIP-v1.4 netif_set_addr()
extern "C" struct netif* eagle_lwip_getif (int netif_index);
extern "C" void netif_set_addr (struct netif* netif, ip4_addr_t* ip, ip4_addr_t* netmask, ip4_addr_t* gw);
#endif

bool ESP8266WiFiSTAClass::config(IPAddress local_ip, IPAddress arg1, IPAddress arg2, IPAddress arg3, IPAddress dns2) {

if(!WiFi.enableSTA(true)) {
Expand Down Expand Up @@ -310,6 +331,12 @@ bool ESP8266WiFiSTAClass::config(IPAddress local_ip, IPAddress arg1, IPAddress a
dns_setserver(1, dns2);
}

#if LWIP_VERSION_MAJOR != 1
// trigger address change by calling lwIP-v1.4 api
// (see explanation above)
netif_set_addr(eagle_lwip_getif(STATION_IF), &info.ip, &info.netmask, &info.gw);
#endif

return true;
}

Expand Down