- Fixed failover reconnection retry code to continue to retry to reconnect

  rather than restarting the listener.  [ISC-Bugs #19618]

diff --git a/RELNOTES b/RELNOTES
index 60b96b36156d2ad93076d88a6310568bf7235894..a5efdbfc279acb60c345374458422180f929dda2 100644 (file)
--- 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 3f4b2fb6b7be5b98373fbbb80b005b45e75aae52..462655ca2b0b6fd4cc7a53a04aad687bf0dc83f7 100644 (file)
--- 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);
        }
 }