From 2756dcb79c3bd955d4c9d3161cc99f3ad6b2fb07 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 3 Mar 2021 00:56:04 +0100 Subject: [PATCH] fix uninitialized variables --- cores/esp8266/LwipDhcpServer.cpp | 9 +-------- libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/cores/esp8266/LwipDhcpServer.cpp b/cores/esp8266/LwipDhcpServer.cpp index 2fa0b12d84..a6b50c7d10 100644 --- a/cores/esp8266/LwipDhcpServer.cpp +++ b/cores/esp8266/LwipDhcpServer.cpp @@ -1140,16 +1140,9 @@ bool DhcpServer::set_dhcps_lease(struct dhcps_lease *please) // logic below is subject for improvement // - is wrong // - limited to /24 address plans -#if 1 - 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); + softap_ip = htonl(ip_2_ip4(&_netif->ip_addr)->addr); start_ip = htonl(please->start_ip.addr); end_ip = htonl(please->end_ip.addr); -#endif /*config ip information can't contain local ip*/ if ((start_ip <= softap_ip) && (softap_ip <= end_ip)) { diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp index 202042c780..042f809807 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp @@ -224,6 +224,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA } struct dhcps_lease dhcp_lease; + dhcp_lease.enable = true; IPAddress ip = local_ip; ip[3] += 99; 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"); ret = false; } else if(local_ip.v4() != info.ip.addr) { - ip = info.ip.addr; - DEBUG_WIFI("[APConfig] IP config not set correct?! new IP: %s\n", ip.toString().c_str()); + DEBUG_WIFI("[APConfig] IP config not set correct?! new IP: %s\n", IPAddress(info.ip.addr).toString().c_str()); ret = false; } } else { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy