From dedde1ba350ecc20a242868456226bbf924654fa Mon Sep 17 00:00:00 2001 From: David Hankins Date: Wed, 22 Apr 2009 20:27:58 +0000 Subject: [PATCH] - Fixed failover reconnection retry code to continue to retry to reconnect rather than restarting the listener. [ISC-Bugs #19618] --- RELNOTES | 3 +++ server/failover.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/RELNOTES b/RELNOTES index 60b96b361..a5efdbfc2 100644 --- a/RELNOTES +++ b/RELNOTES @@ -115,6 +115,9 @@ work on other platforms. Please report any problems and suggested fixes to to be double-quoted. Also allow server-provided hostname to override hostnames 'localhost' and '(none)'. +- Fixed failover reconnection retry code to continue to retry to reconnect + rather than restarting the listener. + Changes since 4.1.0b1 - A missing "else" in dhcrelay.c could have caused an interface not to diff --git a/server/failover.c b/server/failover.c index 3f4b2fb6b..462655ca2 100644 --- a/server/failover.c +++ b/server/failover.c @@ -3005,15 +3005,13 @@ void dhcp_failover_reconnect (void *vs) log_info ("failover peer %s: %s", state -> name, isc_result_totext (status)); #if defined (DEBUG_FAILOVER_TIMING) - log_info ("add_timeout +90 %s", - "dhcp_failover_listener_restart"); + log_info("add_timeout +90 dhcp_failover_reconnect"); #endif tv . tv_sec = cur_time + 90; tv . tv_usec = 0; - add_timeout (&tv, - dhcp_failover_listener_restart, state, - (tvref_t)dhcp_failover_state_reference, - (tvunref_t)dhcp_failover_state_dereference); + add_timeout(&tv, dhcp_failover_reconnect, state, + (tvref_t)dhcp_failover_state_reference, + (tvunref_t)dhcp_failover_state_dereference); } } -- 2.47.3