#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)
unsigned long debug_trace_level = 0; /* DEBUG_ULTRA */
-time_t cur_time;
-time_t default_lease_time = 43200; /* 12 hours... */
char *path_dhclient_conf = _PATH_DHCLIENT_CONF;
char *path_dhclient_db = NULL;
struct iaddr iaddr_broadcast = { 4, { 255, 255, 255, 255 } };
struct in_addr inaddr_any;
struct sockaddr_in sockaddr_broadcast;
-unsigned long old_default_route = 0;
/*
* ASSERT_STATE() does nothing now; it used to be
PipeInit();
tzset();
- time(&cur_time);
memset(&sockaddr_broadcast, 0, sizeof(sockaddr_broadcast));
sockaddr_broadcast.sin_family = AF_INET;
flags. */
make_request(ip, ip->client->active);
ip->client->destination = iaddr_broadcast;
- ip->client->first_sending = cur_time;
+ time(&ip->client->first_sending);
ip->client->interval = ip->client->config->initial_interval;
/* Zap the medium list... */
ip->client->xid = ip->client->packet.xid;
ip->client->destination = iaddr_broadcast;
ip->client->state = S_SELECTING;
- ip->client->first_sending = cur_time;
+ time(&ip->client->first_sending);
ip->client->interval = ip->client->config->initial_interval;
/* Add an immediate timeout to cause the first DHCPDISCOVER packet
{
struct interface_info *ip = ipp;
struct client_lease *lp, *next, *picked;
+ time_t cur_time;
ASSERT_STATE(state, S_SELECTING);
+ time(&cur_time);
+
/* Cancel state_selecting and send_discover timeouts, since either
one could have got us here. */
cancel_timeout(state_selecting, ip);
{
struct interface_info *ip = packet->interface;
struct client_lease *lease;
+ time_t cur_time;
+
+ time(&cur_time);
/* If we're not receptive to an offer right now, or if the offer
has an unrecognizable transaction id, then just drop it. */
ip->client->new->expiry = getULong(
ip->client->new->options[DHO_DHCP_LEASE_TIME].data);
else
- ip->client->new->expiry = default_lease_time;
+ ip->client->new->expiry = DHCP_DEFAULT_LEASE_TIME;
/* A number that looks negative here is really just very large,
because the lease expiry offset is unsigned. */
if (ip->client->new->expiry < 0)
}
if( new_lease->options[DHO_ROUTERS].len ) {
- MIB_IPFORWARDROW RouterMib;
NTSTATUS Status;
- RouterMib.dwForwardDest = 0; /* Default route */
- RouterMib.dwForwardMask = 0;
- RouterMib.dwForwardMetric1 = 1;
+ Adapter->RouterMib.dwForwardDest = 0; /* Default route */
+ Adapter->RouterMib.dwForwardMask = 0;
+ Adapter->RouterMib.dwForwardMetric1 = 1;
- if( old_default_route ) {
+ if( Adapter->RouterMib.dwForwardNextHop ) {
/* If we set a default route before, delete it before continuing */
- RouterMib.dwForwardDest = old_default_route;
- DeleteIpForwardEntry( &RouterMib );
+ DeleteIpForwardEntry( &Adapter->RouterMib );
}
- RouterMib.dwForwardNextHop =
+ Adapter->RouterMib.dwForwardNextHop =
*((ULONG*)new_lease->options[DHO_ROUTERS].data);
- Status = CreateIpForwardEntry( &RouterMib );
+ Status = CreateIpForwardEntry( &Adapter->RouterMib );
if( !NT_SUCCESS(Status) )
warning("CreateIpForwardEntry: %lx\n", Status);
- else
- old_default_route = RouterMib.dwForwardNextHop;
if (hkey) {
Buffer[0] = '\0';
{
PDHCP_ADAPTER Adapter;
struct client_lease *new_lease = ip->client->new;
+ time_t cur_time;
+
+ time(&cur_time);
/* Remember the medium. */
ip->client->new->medium = ip->client->medium;
} else
ip->client->destination = iaddr_broadcast;
- ip->client->first_sending = cur_time;
+ time(&ip->client->first_sending);
ip->client->interval = ip->client->config->initial_interval;
ip->client->state = S_RENEWING;
int arp_timeout_needed = 0, stop_selecting;
char *name = packet->options[DHO_DHCP_MESSAGE_TYPE].len ?
"DHCPOFFER" : "BOOTREPLY";
+ time_t cur_time;
+
+ time(&cur_time);
/* If we're not receptive to an offer right now, or if the offer
has an unrecognizable transaction id, then just drop it. */
{
struct interface_info *ip = ipp;
int interval, increase = 1;
+ time_t cur_time;
DH_DbgPrint(MID_TRACE,("Doing discover on interface %p\n",ip));
+ time(&cur_time);
+
/* Figure out how long it's been since we started transmitting. */
interval = cur_time - ip->client->first_sending;
struct interface_info *ip = ipp;
struct client_lease *loop = ip->client->active;
struct client_lease *lp;
+ time_t cur_time;
note("No DHCPOFFERS received.");
+ time(&cur_time);
+
/* We may not have an active lease, but we may have some
predefined leases that we can try. */
if (!ip->client->active && ip->client->leases)
struct sockaddr_in destination;
struct in_addr from;
int interval;
+ time_t cur_time;
+
+ time(&cur_time);
/* Figure out how long it's been since we started transmitting. */
interval = cur_time - ip->client->first_sending;