mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-06 06:39:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #48510, DHCP requires ARP

Browse Source 
Use solution 2 proposed by Jens Nielsen
This commit is contained in:
Dirk Ziegelmeier 2016-07-19 09:09:57 +02:00
parent 6c0d78caaa
commit 06c7404461
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/ipv4/dhcp.c
View File

@ -701,12 +701,6 @@ dhcp_start(struct netif *netif)
dhcp = netif->dhcp; dhcp = netif->dhcp;
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_start(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num)); LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_start(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
/* check hwtype of the netif */
if ((netif->flags & NETIF_FLAG_ETHARP) == 0) {
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): No ETHARP netif\n"));
return ERR_ARG;
}
/* check MTU of the netif */ /* check MTU of the netif */
if (netif->mtu < DHCP_MAX_MSG_LEN_MIN_REQUIRED) { if (netif->mtu < DHCP_MAX_MSG_LEN_MIN_REQUIRED) {
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): Cannot use this netif with DHCP: MTU is too small\n")); LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): Cannot use this netif with DHCP: MTU is too small\n"));
@ -1709,8 +1703,13 @@ dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr,
if (dhcp->state == DHCP_STATE_REQUESTING) { if (dhcp->state == DHCP_STATE_REQUESTING) {
dhcp_handle_ack(netif); dhcp_handle_ack(netif);
#if DHCP_DOES_ARP_CHECK #if DHCP_DOES_ARP_CHECK
/* check if the acknowledged lease address is already in use */ if ((netif->flags & NETIF_FLAG_ETHARP) != 0) {
dhcp_check(netif); /* check if the acknowledged lease address is already in use */
dhcp_check(netif);
} else {
/* bind interface to the acknowledged lease address */
dhcp_bind(netif);
}
#else #else
/* bind interface to the acknowledged lease address */ /* bind interface to the acknowledged lease address */
dhcp_bind(netif); dhcp_bind(netif);