arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-07 16:23:38 +03:00
Code

AP & dhcp-server: fix uninitialized variables (#7905)

Browse Source
This commit is contained in:
david gauchard 2021-03-03 01:12:01 +01:00 committed by GitHub
parent e3fe7a5776
commit 807ed51d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cores/esp8266/LwipDhcpServer.cpp
View File

@ -1140,16 +1140,9 @@ bool DhcpServer::set_dhcps_lease(struct dhcps_lease *please)
// logic below is subject for improvement // logic below is subject for improvement
// - is wrong // - is wrong
// - limited to /24 address plans // - limited to /24 address plans
#if 1 softap_ip = htonl(ip_2_ip4(&_netif->ip_addr)->addr);
softap_ip = ip_2_ip4(&_netif->ip_addr)->addr;
#else
struct ip_info info;
bzero(&info, sizeof(struct ip_info));
wifi_get_ip_info(SOFTAP_IF, &info);
softap_ip = htonl(info.ip.addr);
start_ip = htonl(please->start_ip.addr); start_ip = htonl(please->start_ip.addr);
end_ip = htonl(please->end_ip.addr); end_ip = htonl(please->end_ip.addr);
#endif
/*config ip information can't contain local ip*/ /*config ip information can't contain local ip*/
if ((start_ip <= softap_ip) && (softap_ip <= end_ip)) if ((start_ip <= softap_ip) && (softap_ip <= end_ip))
{ {

4
libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
View File

@ -224,6 +224,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
} }
struct dhcps_lease dhcp_lease; struct dhcps_lease dhcp_lease;
dhcp_lease.enable = true;
IPAddress ip = local_ip; IPAddress ip = local_ip;
ip[3] += 99; ip[3] += 99;
dhcp_lease.start_ip.addr = ip.v4(); dhcp_lease.start_ip.addr = ip.v4();
@ -264,8 +265,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
DEBUG_WIFI("[APConfig] IP config Invalid?!\n"); DEBUG_WIFI("[APConfig] IP config Invalid?!\n");
ret = false; ret = false;
} else if(local_ip.v4() != info.ip.addr) { } else if(local_ip.v4() != info.ip.addr) {
ip = info.ip.addr; DEBUG_WIFI("[APConfig] IP config not set correct?! new IP: %s\n", IPAddress(info.ip.addr).toString().c_str());
DEBUG_WIFI("[APConfig] IP config not set correct?! new IP: %s\n", ip.toString().c_str());
ret = false; ret = false;
} }
} else { } else {