From c4d85d8628a1034433ab84757b629e8ec545fc74 Mon Sep 17 00:00:00 2001 From: usualtreee <1340399194@qq.com> Date: Thu, 5 Nov 2026 11:17:07 +0800 Subject: [PATCH] =?UTF-8?q?[net][dhcp]=20=E9=99=90=E5=88=B6=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=B1=A0=E8=80=97=E5=B0=BD=E5=90=8E=E7=9A=84=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=88=86=E9=85=8D=20(#11947)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在地址池遍历完成后退出分配,避免持续分配客户端对象。 --- components/net/lwip-dhcpd/dhcp_server_raw.c | 23 ++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/components/net/lwip-dhcpd/dhcp_server_raw.c b/components/net/lwip-dhcpd/dhcp_server_raw.c index e43eb7fd4c..f0d7b4aaed 100644 --- a/components/net/lwip-dhcpd/dhcp_server_raw.c +++ b/components/net/lwip-dhcpd/dhcp_server_raw.c @@ -48,7 +48,8 @@ #include #if (LWIP_VERSION) < 0x02000000U - #error "not support old LWIP" +// cppcheck-suppress preprocessorErrorDirective +#error "not support old LWIP" #endif #if !LWIP_IPV4 @@ -232,6 +233,7 @@ dhcp_client_alloc(struct dhcp_server *dhcpserver, struct dhcp_msg *msg, { u8_t *opt; u32_t ipaddr; + u32_t first_candidate; struct dhcp_client_node *node; node = dhcp_client_find_by_mac(dhcpserver, msg->chaddr, msg->hlen); @@ -250,18 +252,29 @@ dhcp_client_alloc(struct dhcp_server *dhcpserver, struct dhcp_msg *msg, } } -dhcp_alloc_again: - node = dhcp_client_find_by_ip(dhcpserver, &dhcpserver->current); - if (node != NULL) + /* Check each pool address at most once. */ + first_candidate = dhcpserver->current.addr; + do { + node = dhcp_client_find_by_ip(dhcpserver, &dhcpserver->current); + if (node == NULL) + { + break; + } + ipaddr = (ntohl(dhcpserver->current.addr) + 1); if (ipaddr > ntohl(dhcpserver->end.addr)) { ipaddr = ntohl(dhcpserver->start.addr); } dhcpserver->current.addr = htonl(ipaddr); - goto dhcp_alloc_again; + } while (dhcpserver->current.addr != first_candidate); + + if (node != NULL) + { + return NULL; } + node = (struct dhcp_client_node *)mem_malloc(sizeof(struct dhcp_client_node)); if (node == NULL) {