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

Fix DHCP server pbuf handling and allow to change netif address (#8602)

Browse Source 
* Fix sending NACK, use helper function to fill pbuf

As noticed in https://github.com/esp8266/Arduino/pull/8582#issuecomment-1153331408
Plus, handle the case when `pbuf->len` is less than struct size

* Make sure to call SDK functions to start and stop DHCP server

As noticed in https://github.com/esp8266/Arduino/pull/8582#issuecomment-1153331408
Can't really use `server.begin()` and `server.end()` directly, only
default static IP is applied to the interface since DHCP server is
deemed 'running' (see `wifi_softap_dhcps_status()` return value)

* s

Co-authored-by: david gauchard <gauchard@laas.fr>
This commit is contained in:
Max Prokhorov
2022-06-27 03:26:05 +03:00
committed by GitHub
parent 0bff52fe55
commit 7e5520c23e
2 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cores/esp8266/LwipDhcpServer.cpp
View File

@ -414,7 +414,7 @@ DhcpServer::OptionsBuffer DhcpServer::create_msg(struct dhcps_msg* m)
///////////////////////////////////////////////////////////////////////////////////
void DhcpServer::send_offer(struct dhcps_msg* m)
{
struct pbuf *p, *q;
struct pbuf* p;
auto options = create_msg(m);
options.add(DHCP_OPTION_MSG_TYPE, DHCPOFFER);
@ -438,12 +438,7 @@ void DhcpServer::send_offer(struct dhcps_msg* m)
os_printf("dhcps: send_offer>>p->tot_len = %d\n", p->tot_len);
os_printf("dhcps: send_offer>>p->len = %d\n", p->len);
#endif
q = p;
while (q != nullptr)
{
std::memcpy((u8_t*)q->payload, reinterpret_cast<u8_t*>(&m), q->len);
q = q->next;
}
pbuf_take(p, m, sizeof(struct dhcps_msg));
}
else
{
@ -475,7 +470,7 @@ void DhcpServer::send_offer(struct dhcps_msg* m)
///////////////////////////////////////////////////////////////////////////////////
void DhcpServer::send_nak(struct dhcps_msg* m)
{
struct pbuf *p, *q;
struct pbuf* p;
auto options = create_msg(m);
options.add(DHCP_OPTION_MSG_TYPE, DHCPNAK);
@ -492,12 +487,7 @@ void DhcpServer::send_nak(struct dhcps_msg* m)
os_printf("dhcps: send_nak>>p->tot_len = %d\n", p->tot_len);
os_printf("dhcps: send_nak>>p->len = %d\n", p->len);
#endif
q = p;
while (q != nullptr)
{
std::memcpy((u8_t*)q->payload, (u8_t*)m, q->len);
q = q->next;
}
pbuf_take(p, m, sizeof(struct dhcps_msg));
}
else
{
@ -524,7 +514,7 @@ void DhcpServer::send_nak(struct dhcps_msg* m)
///////////////////////////////////////////////////////////////////////////////////
void DhcpServer::send_ack(struct dhcps_msg* m)
{
struct pbuf *p, *q;
struct pbuf* p;
auto options = create_msg(m);
options.add(DHCP_OPTION_MSG_TYPE, DHCPACK);
@ -548,12 +538,7 @@ void DhcpServer::send_ack(struct dhcps_msg* m)
os_printf("dhcps: send_ack>>p->tot_len = %d\n", p->tot_len);
os_printf("dhcps: send_ack>>p->len = %d\n", p->len);
#endif
q = p;
while (q != nullptr)
{
std::memcpy((u8_t*)q->payload, (u8_t*)m, q->len);
q = q->next;
}
pbuf_take(p, m, sizeof(struct dhcps_msg));
}
else
{