From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 3 Mar 2020 18:41:25 +0000 (-0500)
Subject: [#1115] Fixed name collision
X-Git-Tag: Kea-1.7.6~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2220a8679202fb2d5a36aab4677be4bd6044729;p=thirdparty%2Fkea.git

[#1115] Fixed name collision

src/bin/dhcp4/ctrl_dhcp4_srv.*
src/bin/dhcp4/ctrl_dhcp6_srv.*
    renamed shutdown(exit_value) -> shutdownServer(exit_value)
---

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index b3f1fa76ce..4a7b6bc840 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -226,7 +226,7 @@ ControlledDhcpv4Srv::commandShutdownHandler(const string&, ConstElementPtr args)
         }
     }
 
-    ControlledDhcpv4Srv::getInstance()->shutdown(exit_value);
+    ControlledDhcpv4Srv::getInstance()->shutdownServer(exit_value);
     return (createAnswer(CONTROL_RESULT_SUCCESS, "Shutting down."));
 }
 
@@ -972,10 +972,10 @@ ControlledDhcpv4Srv::ControlledDhcpv4Srv(uint16_t server_port /*= DHCP4_SERVER_P
         boost::bind(&StatsMgr::statisticSetMaxSampleCountAllHandler, _1, _2));
 }
 
-void ControlledDhcpv4Srv::shutdown(int exit_value) {
+void ControlledDhcpv4Srv::shutdownServer(int exit_value) {
     setExitValue(exit_value);
     io_service_.stop();       // Stop ASIO transmissions
-    Dhcpv4Srv::shutdown();    // Initiate DHCPv4 shutdown procedure.
+    shutdown();               // Initiate DHCPv4 shutdown procedure.
 }
 
 ControlledDhcpv4Srv::~ControlledDhcpv4Srv() {
@@ -1084,7 +1084,7 @@ ControlledDhcpv4Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
             // We're out of retries, log it and initiate shutdown.
             LOG_ERROR(dhcp4_logger, DHCP4_DB_RECONNECT_RETRIES_EXHAUSTED)
             .arg(db_reconnect_ctl->maxRetries());
-            shutdown(EXIT_FAILURE);
+            shutdownServer(EXIT_FAILURE);
             return;
         }
 
@@ -1123,7 +1123,7 @@ ControlledDhcpv4Srv::dbLostCallback(ReconnectCtlPtr db_reconnect_ctl) {
         LOG_INFO(dhcp4_logger, DHCP4_DB_RECONNECT_DISABLED)
             .arg(db_reconnect_ctl->retriesLeft())
             .arg(db_reconnect_ctl->retryInterval());
-        shutdown(EXIT_FAILURE);
+        shutdownServer(EXIT_FAILURE);
         return(false);
     }
 
diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index d1f8107751..352b91b767 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -64,7 +64,7 @@ public:
 
     /// @brief Initiates shutdown procedure for the whole DHCPv4 server.
     /// @param exit_value integer value to the process should exit with.
-    void shutdown(int exit_value);
+    void shutdownServer(int exit_value);
 
     /// @brief Command processor
     ///
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index e8bb15af05..26f85932fd 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -230,7 +230,7 @@ ControlledDhcpv6Srv::commandShutdownHandler(const string&, ConstElementPtr args)
         }
     }
 
-    ControlledDhcpv6Srv::getInstance()->shutdown(exit_value);
+    ControlledDhcpv6Srv::getInstance()->shutdownServer(exit_value);
     return(createAnswer(CONTROL_RESULT_SUCCESS, "Shutting down."));
 }
 
@@ -994,10 +994,10 @@ ControlledDhcpv6Srv::ControlledDhcpv6Srv(uint16_t server_port,
         boost::bind(&StatsMgr::statisticSetMaxSampleCountAllHandler, _1, _2));
 }
 
-void ControlledDhcpv6Srv::shutdown(int exit_value) {
+void ControlledDhcpv6Srv::shutdownServer(int exit_value) {
     setExitValue(exit_value);
     io_service_.stop();    // Stop ASIO transmissions
-    Dhcpv6Srv::shutdown(); // Initiate DHCPv6 shutdown procedure.
+    shutdown();            // Initiate DHCPv6 shutdown procedure.
 }
 
 ControlledDhcpv6Srv::~ControlledDhcpv6Srv() {
@@ -1106,7 +1106,7 @@ ControlledDhcpv6Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
             // We're out of retries, log it and initiate shutdown.
             LOG_ERROR(dhcp6_logger, DHCP6_DB_RECONNECT_RETRIES_EXHAUSTED)
             .arg(db_reconnect_ctl->maxRetries());
-            shutdown(EXIT_FAILURE);
+            shutdownServer(EXIT_FAILURE);
             return;
         }
 
@@ -1144,7 +1144,7 @@ ControlledDhcpv6Srv::dbLostCallback(ReconnectCtlPtr db_reconnect_ctl) {
         LOG_INFO(dhcp6_logger, DHCP6_DB_RECONNECT_DISABLED)
             .arg(db_reconnect_ctl->retriesLeft())
             .arg(db_reconnect_ctl->retryInterval());
-        shutdown(EXIT_FAILURE);
+        shutdownServer(EXIT_FAILURE);
         return(false);
     }
 
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index 911eb01908..7e268a506e 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -64,7 +64,7 @@ public:
 
     /// @brief Initiates shutdown procedure for the whole DHCPv6 server.
     /// @param exit_value integer value to the process should exit with.
-    virtual void shutdown(int exit_value);
+    virtual void shutdownServer(int exit_value);
 
     /// @brief Command processor
     ///