mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-07-02 19:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed invalid dependency to etharp_query if DHCP_DOES_ARP_CHECK==0

Browse Source
This commit is contained in:
goldsimon 2009-08-25 17:49:47 +00:00
parent 2c618705f0
commit f2f20cf133
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -32,6 +32,9 @@ HISTORY
++ Bugfixes: ++ Bugfixes:
2009-08-25 Simon Goldschmidt
* dhcp.c: fixed invalid dependency to etharp_query if DHCP_DOES_ARP_CHECK==0
2009-08-23 Simon Goldschmidt 2009-08-23 Simon Goldschmidt
* ppp.c: bug #27078: Possible memory leak in pppInit() * ppp.c: bug #27078: Possible memory leak in pppInit()

6
src/core/dhcp.c
View File

@ -109,9 +109,9 @@ static void dhcp_handle_offer(struct netif *netif);
static err_t dhcp_discover(struct netif *netif); static err_t dhcp_discover(struct netif *netif);
static err_t dhcp_select(struct netif *netif); static err_t dhcp_select(struct netif *netif);
static void dhcp_check(struct netif *netif);
static void dhcp_bind(struct netif *netif); static void dhcp_bind(struct netif *netif);
#if DHCP_DOES_ARP_CHECK #if DHCP_DOES_ARP_CHECK
static void dhcp_check(struct netif *netif);
static err_t dhcp_decline(struct netif *netif); static err_t dhcp_decline(struct netif *netif);
#endif /* DHCP_DOES_ARP_CHECK */ #endif /* DHCP_DOES_ARP_CHECK */
static err_t dhcp_rebind(struct netif *netif); static err_t dhcp_rebind(struct netif *netif);
@ -178,6 +178,7 @@ dhcp_handle_nak(struct netif *netif)
dhcp_discover(netif); dhcp_discover(netif);
} }
#if DHCP_DOES_ARP_CHECK
/** /**
* Checks if the offered IP address is already in use. * Checks if the offered IP address is already in use.
* *
@ -207,6 +208,7 @@ dhcp_check(struct netif *netif)
dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS; dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_check(): set request timeout %"U16_F" msecs\n", msecs)); LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_check(): set request timeout %"U16_F" msecs\n", msecs));
} }
#endif /* DHCP_DOES_ARP_CHECK */
/** /**
* Remember the configuration offered by a DHCP server. * Remember the configuration offered by a DHCP server.
@ -396,6 +398,7 @@ dhcp_timeout(struct netif *netif)
dhcp_release(netif); dhcp_release(netif);
dhcp_discover(netif); dhcp_discover(netif);
} }
#if DHCP_DOES_ARP_CHECK
/* received no ARP reply for the offered address (which is good) */ /* received no ARP reply for the offered address (which is good) */
} else if (dhcp->state == DHCP_CHECKING) { } else if (dhcp->state == DHCP_CHECKING) {
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): CHECKING, ARP request timed out\n")); LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): CHECKING, ARP request timed out\n"));
@ -407,6 +410,7 @@ dhcp_timeout(struct netif *netif)
/* bind the interface to the offered address */ /* bind the interface to the offered address */
dhcp_bind(netif); dhcp_bind(netif);
} }
#endif /* DHCP_DOES_ARP_CHECK */
} }
/* did not get response to renew request? */ /* did not get response to renew request? */
else if (dhcp->state == DHCP_RENEWING) { else if (dhcp->state == DHCP_RENEWING) {