emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fold renew_requested_timeout() into requesting_timeout().

Browse Source
This commit is contained in:
Nicholas J. Kain 2011-06-30 00:11:43 -04:00
parent 6ea5ac0d5d
commit d6fcb35903
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ndhc/state.c
View File

@ -21,7 +21,6 @@ static void requesting_timeout(struct client_state_t *cs);
static void bound_timeout(struct client_state_t *cs); static void bound_timeout(struct client_state_t *cs);
static void renewing_timeout(struct client_state_t *cs); static void renewing_timeout(struct client_state_t *cs);
static void rebinding_timeout(struct client_state_t *cs); static void rebinding_timeout(struct client_state_t *cs);
static void renew_requested_timeout(struct client_state_t *cs);
static void released_timeout(struct client_state_t *cs); static void released_timeout(struct client_state_t *cs);
static void anfrelease(struct client_state_t *cs); static void anfrelease(struct client_state_t *cs);
static void nfrelease(struct client_state_t *cs); static void nfrelease(struct client_state_t *cs);
@ -36,7 +35,6 @@ typedef struct {
void (*force_release_fn)(struct client_state_t *cs); void (*force_release_fn)(struct client_state_t *cs);
} dhcp_state_t; } dhcp_state_t;
// packet, timeout, renew, release
dhcp_state_t dhcp_states[] = { dhcp_state_t dhcp_states[] = {
{ selecting_packet, selecting_timeout, 0, frelease}, // SELECTING { selecting_packet, selecting_timeout, 0, frelease}, // SELECTING
{ an_packet, requesting_timeout, frenew, frelease}, // REQUESTING { an_packet, requesting_timeout, frenew, frelease}, // REQUESTING
@ -45,7 +43,7 @@ dhcp_state_t dhcp_states[] = {
{ an_packet, rebinding_timeout, frenew, nfrelease}, // REBINDING { an_packet, rebinding_timeout, frenew, nfrelease}, // REBINDING
{ 0, arp_gw_failed, frenew, frelease}, // ARP_GW_CHECK XXX { 0, arp_gw_failed, frenew, frelease}, // ARP_GW_CHECK XXX
{ 0, arp_success, frenew, anfrelease}, // ARP_CHECK { 0, arp_success, frenew, anfrelease}, // ARP_CHECK
{ an_packet, renew_requested_timeout, frenew, frelease}, // RENEW_REQUESTED { an_packet, requesting_timeout, frenew, frelease}, // RENEW_REQUESTED
{ 0, released_timeout, frenew, frelease}, // RELEASED { 0, released_timeout, frenew, frelease}, // RELEASED
{ 0, 0, 0, 0}, // NUM_STATES { 0, 0, 0, 0}, // NUM_STATES
}; };
@ -57,6 +55,9 @@ dhcp_state_t dhcp_states[] = {
static void requesting_timeout(struct client_state_t *cs) static void requesting_timeout(struct client_state_t *cs)
{ {
if (cs->packetNum < NUMPACKETS) { if (cs->packetNum < NUMPACKETS) {
if (cs->dhcpState == DS_RENEW_REQUESTED)
send_renew(cs->xid, cs->serverAddr, cs->requestedIP);
else
send_selecting(cs->xid, cs->serverAddr, cs->requestedIP); send_selecting(cs->xid, cs->serverAddr, cs->requestedIP);
cs->timeout = ((cs->packetNum == NUMPACKETS - 1) ? 10 : 2) * 1000; cs->timeout = ((cs->packetNum == NUMPACKETS - 1) ? 10 : 2) * 1000;
cs->packetNum++; cs->packetNum++;
@ -117,22 +118,6 @@ static void rebinding_timeout(struct client_state_t *cs)
} }
} }
static void renew_requested_timeout(struct client_state_t *cs)
{
if (cs->packetNum < NUMPACKETS) {
/* send unicast request packet */
send_renew(cs->xid, cs->serverAddr, cs->requestedIP);
cs->timeout = ((cs->packetNum == NUMPACKETS - 1) ? 10 : 2) * 1000;
cs->packetNum++;
} else {
ifchange(NULL, IFCHANGE_DECONFIG);
cs->dhcpState = DS_SELECTING;
cs->timeout = 0;
cs->packetNum = 0;
change_listen_mode(cs, LM_RAW);
}
}
static void released_timeout(struct client_state_t *cs) static void released_timeout(struct client_state_t *cs)
{ {
cs->timeout = -1; cs->timeout = -1;