xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2024-11-22 09:31:51 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Extend DHCP timeout"

Browse Source 
This reverts commit fea8166abf.
This commit is contained in:
Jarrod Johnson 2014-07-07 13:36:19 -04:00
parent 8253588782
commit 2b388f9ea9
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/ipxe/dhcp.h
View File

@ -639,6 +639,10 @@ struct dhcphdr {
*/
#define DHCP_MIN_LEN 552
/** Timeouts for sending DHCP packets */
#define DHCP_MIN_TIMEOUT ( 1 * TICKS_PER_SEC )
#define DHCP_MAX_TIMEOUT ( 10 * TICKS_PER_SEC )
/** Maximum time that we will wait for ProxyDHCP responses */
#define PROXYDHCP_MAX_TIMEOUT ( 2 * TICKS_PER_SEC )

21
src/net/udp/dhcp.c
View File

@ -171,8 +171,8 @@ struct dhcp_session_state {
void ( * expired ) ( struct dhcp_session *dhcp );
/** Transmitted message type */
uint8_t tx_msgtype;
uint8_t min_timeout;
uint8_t max_timeout;
/** Apply minimum timeout */
uint8_t apply_min_timeout;
};
static struct dhcp_session_state dhcp_state_discover;
@ -272,8 +272,9 @@ static void dhcp_set_state ( struct dhcp_session *dhcp,
dhcp->state = state;
dhcp->start = currticks();
stop_timer ( &dhcp->timer );
dhcp->timer.min_timeout = state->min_timeout * TICKS_PER_SEC;
dhcp->timer.max_timeout = state->max_timeout * TICKS_PER_SEC;
dhcp->timer.min_timeout =
( state->apply_min_timeout ? DHCP_MIN_TIMEOUT : 0 );
dhcp->timer.max_timeout = DHCP_MAX_TIMEOUT;
start_timer_nodelay ( &dhcp->timer );
}
@ -446,8 +447,7 @@ static struct dhcp_session_state dhcp_state_discover = {
.rx = dhcp_discovery_rx,
.expired = dhcp_discovery_expired,
.tx_msgtype = DHCPDISCOVER,
.min_timeout = 4,
.max_timeout = 32,
.apply_min_timeout = 1,
};
/**
@ -584,8 +584,7 @@ static struct dhcp_session_state dhcp_state_request = {
.rx = dhcp_request_rx,
.expired = dhcp_request_expired,
.tx_msgtype = DHCPREQUEST,
.min_timeout = 1,
.max_timeout = 8,
.apply_min_timeout = 0,
};
/**
@ -686,8 +685,7 @@ static struct dhcp_session_state dhcp_state_proxy = {
.rx = dhcp_proxy_rx,
.expired = dhcp_proxy_expired,
.tx_msgtype = DHCPREQUEST,
.min_timeout = 1,
.max_timeout = 8,
.apply_min_timeout = 0,
};
/**
@ -834,8 +832,7 @@ static struct dhcp_session_state dhcp_state_pxebs = {
.rx = dhcp_pxebs_rx,
.expired = dhcp_pxebs_expired,
.tx_msgtype = DHCPREQUEST,
.min_timeout = 1,
.max_timeout = 8,
.apply_min_timeout = 1,
};
/****************************************************************************