diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2012-04-16 13:25:36 +0200 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2012-04-16 13:25:36 +0200 |
| commit | aaf12f3264d8fa96c65a18efad8161368200f8e3 (patch) | |
| tree | 05a9c405af9f5c0e10b6ed6ebbb86ff5fbb8013f /server/dhcpleasequery.c | |
| parent | 402b4a6e3f8c2f42fe326b0b90c5311d2edbb6f3 (diff) | |
| parent | aa161a719e968da4be1a97b2b7ccf312dafad3dc (diff) | |
Diffstat (limited to 'server/dhcpleasequery.c')
| -rw-r--r-- | server/dhcpleasequery.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c index 9daff89..09913c2 100644 --- a/server/dhcpleasequery.c +++ b/server/dhcpleasequery.c @@ -1,4 +1,5 @@ /* + * Copyright (C) 2011-2012 by Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2006-2007,2009 by Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any @@ -454,10 +455,7 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) { (lease_duration / 8); if (time_renewal > cur_time) { - if (time_renewal < cur_time) - time_renewal = 0; - else - time_renewal = htonl(time_renewal - cur_time); + time_renewal = htonl(time_renewal - cur_time); if (!add_option(options, DHO_DHCP_RENEWAL_TIME, @@ -487,15 +485,8 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) { } if (lease->ends > cur_time) { - if (time_expiry < cur_time) { - log_error("Impossible condition at %s:%d.", - MDL); - - option_state_dereference(&options, MDL); - lease_dereference(&lease, MDL); - return; - } time_expiry = htonl(lease->ends - cur_time); + if (!add_option(options, DHO_DHCP_LEASE_TIME, &time_expiry, |