Merge branch 'fix/fix_dhcp_server_recv_decline_issue_v55' into 'release/v5.5'

Jiang Jiang Jian · Jiang Jiang Jian · commit 93603cd3a331 · 2025-10-09T13:00:33.000+08:00
fix(lwip): fix dhcp arp check issue v55

See merge request espressif/esp-idf!41770
diff --git a/components/lwip/port/acd_dhcp_check.c b/components/lwip/port/acd_dhcp_check.c
@@ -77,6 +77,7 @@ acd_arp_reply(struct netif *netif, struct etharp_hdr *hdr)
         LWIP_DEBUGF(ACD_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE | LWIP_DBG_LEVEL_WARNING,
                     ("acd_arp_reply(): arp reply matched with offered address, declining\n"));
         dhcp->acd.acd_conflict_callback(netif, ACD_DECLINE);
+        dhcp->acd.acd_conflict_callback(netif, ACD_RESTART_CLIENT);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ acd_arp_reply(struct netif netif, struct etharp_hdr hdr)`
`77`	`77`	`LWIP_DEBUGF(ACD_DEBUG \| LWIP_DBG_TRACE \| LWIP_DBG_STATE \| LWIP_DBG_LEVEL_WARNING,`
`78`	`78`	`("acd_arp_reply(): arp reply matched with offered address, declining\n"));`
`79`	`79`	`dhcp->acd.acd_conflict_callback(netif, ACD_DECLINE);`
	`80`	`+ dhcp->acd.acd_conflict_callback(netif, ACD_RESTART_CLIENT);`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`