[#1330] Moved closeSockets

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 45dec95a21d3952ec4c7b69a2a8566a9d0d7a81d..c950ee07eb645f4b140195ac1a65459cb5fc58ee 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -315,8 +315,9 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
     // so newly recreated configuration starts with first subnet-id equal 1.
     Subnet::resetSubnetID();
 
-    // Remove any existing timers.
+    // Close DHCP sockets and remove any existing timers.
     if (!check_only) {
+        IfaceMgr::instance().closeSockets();
         TimerMgr::instance()->unregisterTimers();
         server.discardPackets();
         server.getCBControl()->reset();

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 9df0195bb2ea2e10ba3da12478947422d36bd192..ee2203c8d1d6254bbdee8c88213e24fe34fb949a 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -417,8 +417,9 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
     // so newly recreated configuration starts with first subnet-id equal 1.
     Subnet::resetSubnetID();
 
-    // Remove any existing timers.
+    // Close DHCP sockets and remove any existing timers.
     if (!check_only) {
+        IfaceMgr::instance().closeSockets();
         TimerMgr::instance()->unregisterTimers();
         server.discardPackets();
         server.getCBControl()->reset();

diff --git a/src/lib/dhcpsrv/parsers/ifaces_config_parser.cc b/src/lib/dhcpsrv/parsers/ifaces_config_parser.cc
index 3cccfaba73bc240b3f4c7bd6c30d41b9df411f4c..d1db5dcaab258e4166d93fc7344d0a213770ecc2 100644 (file)
--- a/src/lib/dhcpsrv/parsers/ifaces_config_parser.cc
+++ b/src/lib/dhcpsrv/parsers/ifaces_config_parser.cc
@@ -41,11 +41,6 @@ void
 IfacesConfigParser::parse(const CfgIfacePtr& cfg,
                           const isc::data::ConstElementPtr& ifaces_config) {
 
-    // Close sockets if not in test mode.
-    if (!test_mode_) {
-        IfaceMgr::instance().closeSockets();
-    }
-
     // Check for re-detect before calling parseInterfacesList()
     bool re_detect = getBoolean(ifaces_config, "re-detect");
     cfg->setReDetect(re_detect);