Shrink a delay and whitespace fix.

This commit is contained in:
Nicholas J. Kain 2011-03-31 15:28:32 -04:00
parent 996983143e
commit c7ff945be8
2 changed files with 3 additions and 4 deletions

View File

@ -1,5 +1,5 @@
/* packet.c - send and react to DHCP message packets /* packet.c - send and react to DHCP message packets
* Time-stamp: <2011-03-31 01:59:17 nk> * Time-stamp: <2011-03-31 15:22:59 nk>
* *
* (c) 2004-2011 Nicholas J. Kain <njkain at gmail dot com> * (c) 2004-2011 Nicholas J. Kain <njkain at gmail dot com>
* (c) 2001 Russ Dill <Russ.Dill@asu.edu> * (c) 2001 Russ Dill <Russ.Dill@asu.edu>
@ -297,7 +297,7 @@ static void dhcp_ack_or_nak_packet(struct client_state_t *cs,
if (cs->dhcpState != DS_REQUESTING) if (cs->dhcpState != DS_REQUESTING)
ifchange(NULL, IFCHANGE_DECONFIG); ifchange(NULL, IFCHANGE_DECONFIG);
cs->dhcpState = DS_INIT_SELECTING; cs->dhcpState = DS_INIT_SELECTING;
cs->timeout = 5000; cs->timeout = 3000;
cs->requestedIP = 0; cs->requestedIP = 0;
cs->packetNum = 0; cs->packetNum = 0;
change_listen_mode(cs, LM_RAW); change_listen_mode(cs, LM_RAW);

View File

@ -1,5 +1,5 @@
/* timeout.c - callbacks to react to event timeouts /* timeout.c - callbacks to react to event timeouts
* Time-stamp: <2011-03-30 23:42:13 nk> * Time-stamp: <2011-03-31 15:18:41 nk>
* *
* (c) 2004-2011 Nicholas J. Kain <njkain at gmail dot com> * (c) 2004-2011 Nicholas J. Kain <njkain at gmail dot com>
* *
@ -37,7 +37,6 @@ static void init_selecting_timeout(struct client_state_t *cs)
cs->xid = random_xid(); cs->xid = random_xid();
/* broadcast */ /* broadcast */
send_discover(cs->xid, cs->requestedIP); send_discover(cs->xid, cs->requestedIP);
cs->timeout = DELAY_SEC * (cs->packetNum + 1) * 1000; cs->timeout = DELAY_SEC * (cs->packetNum + 1) * 1000;
cs->packetNum++; cs->packetNum++;
} else { } else {