Fixed #ifdef LWIP_DHCP position. Fixed extranous comma in function arguments.

This commit is contained in:
likewise 2004-04-16 22:34:25 +00:00
parent 2e2dada561
commit 9106a1f2d5

View File

@ -67,8 +67,6 @@
* to remove the DHCP client. * to remove the DHCP client.
* *
*/ */
#ifdef LWIP_DHCP /* don't build if not configured for use in lwipopt.h */
#include "lwip/stats.h" #include "lwip/stats.h"
#include "lwip/mem.h" #include "lwip/mem.h"
#include "lwip/udp.h" #include "lwip/udp.h"
@ -81,6 +79,8 @@
#include "lwip/opt.h" #include "lwip/opt.h"
#include "lwip/dhcp.h" #include "lwip/dhcp.h"
#ifdef LWIP_DHCP /* don't build if not configured for use in lwipopt.h */
/** global transaction identifier, must be /** global transaction identifier, must be
* unique for each DHCP request. */ * unique for each DHCP request. */
static u32_t xid = 0xABCD0000; static u32_t xid = 0xABCD0000;
@ -710,7 +710,7 @@ static err_t dhcp_discover(struct netif *netif)
udp_bind(dhcp->pcb, IP_ADDR_ANY, DHCP_CLIENT_PORT); udp_bind(dhcp->pcb, IP_ADDR_ANY, DHCP_CLIENT_PORT);
udp_connect(dhcp->pcb, IP_ADDR_ANY, DHCP_SERVER_PORT); udp_connect(dhcp->pcb, IP_ADDR_ANY, DHCP_SERVER_PORT);
LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE, ("dhcp_discover: sendto(DISCOVER, IP_ADDR_BROADCAST, DHCP_SERVER_PORT)\n")); LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE, ("dhcp_discover: sendto(DISCOVER, IP_ADDR_BROADCAST, DHCP_SERVER_PORT)\n"));
udp_sendto(dhcp->pcb, dhcp->p_out, IP_ADDR_BROADCAST, , DHCP_SERVER_PORT); udp_sendto(dhcp->pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT);
LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE, ("dhcp_discover: deleting()ing\n")); LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE, ("dhcp_discover: deleting()ing\n"));
dhcp_delete_request(netif); dhcp_delete_request(netif);
LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE | DBG_STATE, ("dhcp_discover: SELECTING\n")); LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE | DBG_STATE, ("dhcp_discover: SELECTING\n"));