Skip to content

Commit 807ed51

Browse files
authored
AP & dhcp-server: fix uninitialized variables (#7905)
1 parent e3fe7a5 commit 807ed51

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

Diff for: cores/esp8266/LwipDhcpServer.cpp

+1-8
Original file line numberDiff line numberDiff line change
@@ -1140,16 +1140,9 @@ bool DhcpServer::set_dhcps_lease(struct dhcps_lease *please)
11401140
// logic below is subject for improvement
11411141
// - is wrong
11421142
// - limited to /24 address plans
1143-
#if 1
1144-
softap_ip = ip_2_ip4(&_netif->ip_addr)->addr;
1145-
#else
1146-
struct ip_info info;
1147-
bzero(&info, sizeof(struct ip_info));
1148-
wifi_get_ip_info(SOFTAP_IF, &info);
1149-
softap_ip = htonl(info.ip.addr);
1143+
softap_ip = htonl(ip_2_ip4(&_netif->ip_addr)->addr);
11501144
start_ip = htonl(please->start_ip.addr);
11511145
end_ip = htonl(please->end_ip.addr);
1152-
#endif
11531146
/*config ip information can't contain local ip*/
11541147
if ((start_ip <= softap_ip) && (softap_ip <= end_ip))
11551148
{

Diff for: libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
224224
}
225225

226226
struct dhcps_lease dhcp_lease;
227+
dhcp_lease.enable = true;
227228
IPAddress ip = local_ip;
228229
ip[3] += 99;
229230
dhcp_lease.start_ip.addr = ip.v4();
@@ -264,8 +265,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
264265
DEBUG_WIFI("[APConfig] IP config Invalid?!\n");
265266
ret = false;
266267
} else if(local_ip.v4() != info.ip.addr) {
267-
ip = info.ip.addr;
268-
DEBUG_WIFI("[APConfig] IP config not set correct?! new IP: %s\n", ip.toString().c_str());
268+
DEBUG_WIFI("[APConfig] IP config not set correct?! new IP: %s\n", IPAddress(info.ip.addr).toString().c_str());
269269
ret = false;
270270
}
271271
} else {

0 commit comments

Comments
 (0)