[4492] Explicitly unload hook libraries prior during shutdown

A call to HooksManager::getHooksManager().unloadLibraries() was added to
the destructors Dhcpv4Srv::~Dhcpv4Srv() and Dhcpv6Srv::~Dhcpv6Srv(). This
ensures hook libraries are unloaded prior to static objects.

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 49352b256741e63c5fa7ec35b97ac6d8970762fc..2ea7af9c347e375b02349b320dca8509667d271e 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -354,6 +354,9 @@ Dhcpv4Srv::~Dhcpv4Srv() {
     // The lease manager was instantiated during DHCPv4Srv configuration,
     // so we should clean up after ourselves.
     LeaseMgrFactory::destroy();
+
+    // Explicitly unload hooks
+    HooksManager::getHooksManager().unloadLibraries();
 }
 
 void

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 704d63aac86802d9f2675b3429e86c094c5fe287..c99d4d322ac5652fbf2474ee772566375697c149 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -214,6 +214,9 @@ Dhcpv6Srv::~Dhcpv6Srv() {
     IfaceMgr::instance().closeSockets();
 
     LeaseMgrFactory::destroy();
+
+    // Explicitly unload hooks
+    HooksManager::getHooksManager().unloadLibraries();
 }
 
 void Dhcpv6Srv::shutdown() {