mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-04 00:05:30 +00:00
Code Issues Releases Wiki Activity

Don't prematurely expire a lease just because a client starts out in INIT.

Browse Source
This commit is contained in:
Ted Lemon
1999-11-12 17:17:16 +00:00
parent 98c83345a1
commit ffdcd1275a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/dhcp.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: dhcp.c,v 1.126 1999/11/07 20:32:03 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: dhcp.c,v 1.127 1999/11/12 17:17:16 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -71,6 +71,7 @@ void dhcpdiscover (packet)
{ {
struct lease *lease; struct lease *lease;
char msgbuf [1024]; char msgbuf [1024];
TIME when;
sprintf (msgbuf, "DHCPDISCOVER from %s via %s", sprintf (msgbuf, "DHCPDISCOVER from %s via %s",
print_hw_addr (packet -> raw -> htype, print_hw_addr (packet -> raw -> htype,
@@ -103,7 +104,13 @@ void dhcpdiscover (packet)
} }
} }
ack_lease (packet, lease, DHCPOFFER, cur_time + 120, msgbuf); /* Set the lease to really expire in 2 minutes, unless it has
not yet expired, in which case leave its expiry time alone. */
when = cur_time + 120;
if (when < lease -> ends)
when = lease -> ends;
ack_lease (packet, lease, DHCPOFFER, when, msgbuf);
} }
void dhcprequest (packet) void dhcprequest (packet)