espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/fix_dhcp_server_recv_decline_issue_v54' into 'release/v5.4'

Browse Source 
fix(dhcp): fix dhcp server recv decline issue v54

See merge request espressif/esp-idf!38507
This commit is contained in:
Jiang Jiang Jian
2025-04-24 19:52:13 +08:00
parent 97af977d0b c8e36049b1
commit b4bbfe16c1
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/lwip/apps/dhcpserver/dhcpserver.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -141,6 +141,7 @@ struct dhcps_t {
void* dhcps_cb_arg;
struct udp_pcb *dhcps_pcb;
dhcps_handle_state state;
bool has_declined_ip;
};
@@ -169,6 +170,7 @@ dhcps_t *dhcps_new(void)
dhcps->dhcps_captiveportal_uri = NULL;
dhcps->dhcps_pcb = NULL;
dhcps->state = DHCPS_HANDLE_CREATED;
dhcps->has_declined_ip = false;
return dhcps;
}
@@ -967,9 +969,9 @@ static u8_t parse_options(dhcps_t *dhcps, u8_t *optptr, s16_t len)
break;
case DHCPDECLINE://4
s.state = DHCPS_STATE_IDLE;
s.state = DHCPS_STATE_DECLINE;
#if DHCPS_DEBUG
DHCPS_LOG("dhcps: DHCPD_STATE_IDLE\n");
DHCPS_LOG("dhcps: DHCPS_STATE_DECLINE\n");
#endif
break;
@@ -1015,6 +1017,10 @@ static s16_t parse_msg(dhcps_t *dhcps, struct dhcps_msg *m, u16_t len)
dhcps->renew = false;
if (dhcps->plist != NULL) {
if (dhcps->has_declined_ip) {
dhcps->has_declined_ip = false;
}
for (pback_node = dhcps->plist; pback_node != NULL; pback_node = pback_node->pnext) {
pdhcps_pool = pback_node->pnode;
@@ -1045,7 +1051,11 @@ static s16_t parse_msg(dhcps_t *dhcps, struct dhcps_msg *m, u16_t len)
}
}
} else {
dhcps->client_address.addr = dhcps->dhcps_poll.start_ip.addr;
if (dhcps->has_declined_ip) {
dhcps->has_declined_ip = false;
} else {
dhcps->client_address.addr = dhcps->dhcps_poll.start_ip.addr;
}
}
if (dhcps->client_address_plus.addr > dhcps->dhcps_poll.end_ip.addr) {
@@ -1096,7 +1106,7 @@ POOL_CHECK:
s16_t ret = parse_options(dhcps, &m->options[4], len);;
if (ret == DHCPS_STATE_RELEASE || ret == DHCPS_STATE_NAK) {
if (ret == DHCPS_STATE_RELEASE || ret == DHCPS_STATE_NAK || ret == DHCPS_STATE_DECLINE) {
if (pnode != NULL) {
node_remove_from_list(&dhcps->plist, pnode);
free(pnode);
@@ -1108,6 +1118,9 @@ POOL_CHECK:
pdhcps_pool = NULL;
}
if (ret == DHCPS_STATE_DECLINE) {
dhcps->has_declined_ip = true;
}
memset(&dhcps->client_address, 0x0, sizeof(dhcps->client_address));
}