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

- Fix some bugs in the lease timeout code.

Browse Source 
- When transition to FTS_ACTIVE happens, set next state.
- Conditionalize failover-specific code.
This commit is contained in:
Ted Lemon
2000-07-06 10:27:41 +00:00
parent d8e1567c09
commit 5e3683817d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/mdb.c
View File

@@ -43,7 +43,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: mdb.c,v 1.37 2000/07/06 06:26:42 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n"; "$Id: mdb.c,v 1.38 2000/07/06 10:27:41 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -981,8 +981,9 @@ int supersede_lease (comp, lease, commit, propogate, pimmediate)
the pool. */ the pool. */
if (commit && if (commit &&
comp -> sort_time != MIN_TIME && comp -> sort_time != MIN_TIME &&
comp -> sort_time < cur_time && comp -> sort_time > cur_time &&
comp -> sort_time < comp -> pool -> next_event_time) { (comp -> sort_time < comp -> pool -> next_event_time ||
comp -> pool -> next_event_time == MIN_TIME)) {
comp -> pool -> next_event_time = comp -> sort_time; comp -> pool -> next_event_time = comp -> sort_time;
add_timeout (comp -> pool -> next_event_time, add_timeout (comp -> pool -> next_event_time,
pool_timer, comp -> pool, pool_timer, comp -> pool,
@@ -1055,6 +1056,15 @@ void process_state_transition (struct lease *lease)
} }
lease -> binding_state = lease -> next_binding_state; lease -> binding_state = lease -> next_binding_state;
if (lease -> binding_state == FTS_ACTIVE ||
lease -> binding_state == FTS_BACKUP) {
#if defined (FAILOVER_PROTOCOL)
if (lease -> pool && lease -> pool -> failover_peer)
lease -> next_binding_state = FTS_EXPIRED;
else
#endif
lease -> next_binding_state = FTS_FREE;
}
} }
/* Copy the contents of one lease into another, correctly maintaining /* Copy the contents of one lease into another, correctly maintaining
@@ -1736,7 +1746,6 @@ void expire_all_pools ()
for (p = s -> pools; p; p = p -> next) { for (p = s -> pools; p; p = p -> next) {
pool_timer (p); pool_timer (p);
#if defined (FAILOVER_PROTOCOL)
p -> lease_count = 0; p -> lease_count = 0;
p -> free_leases = 0; p -> free_leases = 0;
p -> backup_leases = 0; p -> backup_leases = 0;
@@ -1756,13 +1765,14 @@ void expire_all_pools ()
else if (l -> binding_state == FTS_BACKUP) else if (l -> binding_state == FTS_BACKUP)
p -> backup_leases++; p -> backup_leases++;
} }
#if defined (FAILOVER_PROTOCOL)
if (p -> failover_peer && if (p -> failover_peer &&
l -> tstp > l -> tsfp && l -> tstp > l -> tsfp &&
!(l -> flags & ON_UPDATE_QUEUE)) !(l -> flags & ON_UPDATE_QUEUE))
dhcp_failover_queue_update (l, 1); dhcp_failover_queue_update (l, 1);
#endif
} }
} }
#endif
} }
} }
} }