From 226c7772b8c208a280f498974e9fa094e50c26df Mon Sep 17 00:00:00 2001 From: Xu Chun Guang Date: Sun, 28 Apr 2024 14:19:48 +0800 Subject: [PATCH 1/2] fix(lwip/dhcp_server): Bind dhcps netif to avoid handling the dhcp packet from other netifs --- components/lwip/apps/dhcpserver/dhcpserver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/lwip/apps/dhcpserver/dhcpserver.c b/components/lwip/apps/dhcpserver/dhcpserver.c index 112bdf070b..a511c58f01 100644 --- a/components/lwip/apps/dhcpserver/dhcpserver.c +++ b/components/lwip/apps/dhcpserver/dhcpserver.c @@ -1335,6 +1335,7 @@ err_t dhcps_start(dhcps_t *dhcps, struct netif *netif, ip4_addr_t ip) dhcps->client_address_plus.addr = dhcps->dhcps_poll.start_ip.addr; + udp_bind_netif(dhcps->dhcps_pcb, dhcps->dhcps_netif); udp_bind(dhcps->dhcps_pcb, &netif->ip_addr, DHCPS_SERVER_PORT); udp_recv(dhcps->dhcps_pcb, handle_dhcp, dhcps); #if DHCPS_DEBUG From 294b418686462a928da5cbf7612a14aac53f59cd Mon Sep 17 00:00:00 2001 From: Xu Chun Guang Date: Sun, 28 Apr 2024 17:48:04 +0800 Subject: [PATCH 2/2] docs: Correct spell error in comment --- components/lwip/apps/dhcpserver/dhcpserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lwip/apps/dhcpserver/dhcpserver.c b/components/lwip/apps/dhcpserver/dhcpserver.c index a511c58f01..e24214bf50 100644 --- a/components/lwip/apps/dhcpserver/dhcpserver.c +++ b/components/lwip/apps/dhcpserver/dhcpserver.c @@ -1006,7 +1006,7 @@ static s16_t parse_msg(dhcps_t *dhcps, struct dhcps_msg *m, u16_t len) dhcps->client_address.addr = dhcps->client_address_plus.addr; } - if (flag == false) { // search the fisrt unused ip + if (flag == false) { // search the first unused ip if (first_address.addr < pdhcps_pool->ip.addr) { flag = true; } else {