espressif/esp-lwip
1
0
Fork 0
mirror of https://github.com/espressif/esp-lwip.git synced 2026-09-18 07:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp: Restore dhcp_cb on restart after dhcp_release_and_stop()

Browse Source 
Closes https://github.com/espressif/esp-lwip/issues/32
This commit is contained in:
David Cermak
2021-07-30 14:27:22 +08:00
committed by David Čermák
parent 74cf7f9f92
commit 55ea9d9c7d
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/ipv4/dhcp.c
+23
View File
@@ -442,6 +442,21 @@ dhcp_select(struct netif *netif)
return result;
}
#if ESP_DHCP
/**
* Restarts the DHCP client, typically after the dhcp_release_and_stop()
* This is equivalent to dhcp_start(), but preserves the dhcp callback
*/
static void
dhcp_restart(struct netif *netif)
{
struct dhcp *dhcp = netif_dhcp_data(netif);
void (*cb)(struct netif*) = dhcp->cb;
dhcp_start(netif);
dhcp->cb = cb;
}
#endif /* ESP_DHCP */
/**
* The DHCP timer that checks for lease renewal/rebind timeouts.
* Must be called once a minute (see @ref DHCP_COARSE_TIMER_SECS).
@@ -461,7 +476,11 @@ dhcp_coarse_tmr(void)
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_coarse_tmr(): t0 timeout\n"));
/* this clients' lease time has expired */
dhcp_release_and_stop(netif);
#if ESP_DHCP
dhcp_restart(netif);
#else
dhcp_start(netif);
#endif /* ESP_DHCP */
/* timer is active (non zero), and triggers (zeroes) now? */
} else if (dhcp->t2_rebind_time && (dhcp->t2_rebind_time-- == 1)) {
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_coarse_tmr(): t2 timeout\n"));
@@ -533,7 +552,11 @@ dhcp_timeout(struct netif *netif)
} else {
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): REQUESTING, releasing, restarting\n"));
dhcp_release_and_stop(netif);
#if ESP_DHCP
dhcp_restart(netif);
#else
dhcp_start(netif);
#endif /* ESP_DHCP */
}
#if DHCP_DOES_ARP_CHECK
/* received no ARP reply for the offered address (which is good) */