[#4527] proper poll on shutdown

diff --git a/doc/devel/fuzz.dox b/doc/devel/fuzz.dox
index 744bc5c1598d1753ca01b19170adc8526c4e670e..5b718820658b7808920fb6d9a9add47c53c12c6e 100644 (file)
--- a/doc/devel/fuzz.dox
+++ b/doc/devel/fuzz.dox
@@ -137,7 +137,7 @@ You do these preparatory steps one time:
 
 @code
 if test ! -d ~/oss-fuzz; then
-    git clone ~/oss-fuzz
+    git clone git@github.com:google/oss-fuzz.git ~/oss-fuzz
 fi
 cd ~/oss-fuzz
 

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index cc2568c995392c5e646f21565cc9ba9a8e4ebebf..ae65a91aa8cebb47824dbbdbaf1b5b7d5237fc84 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -123,7 +123,7 @@ ControlledDhcpv4Srv::init(const std::string& file_name) {
 
 void ControlledDhcpv4Srv::cleanup() {
     signal_set_.reset();
-    getIOService()->poll();
+    getIOService()->stopAndPoll();
 }
 
 ConstElementPtr

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 9afb02db662e2818315d54594e267246d11209f3..25c9b30c5c2855977846ccb323bb892857710057 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -126,7 +126,7 @@ ControlledDhcpv6Srv::init(const std::string& file_name) {
 
 void ControlledDhcpv6Srv::cleanup() {
     signal_set_.reset();
-    getIOService()->poll();
+    getIOService()->stopAndPoll();
 }
 
 ConstElementPtr

diff --git a/src/lib/dhcpsrv/lease_mgr.cc b/src/lib/dhcpsrv/lease_mgr.cc
index 5f1ea3d8c84777245b401ddd28e68ebbb5c91b10..60d491a3ff79b023b880bf0c488a5b7191596aba 100644 (file)
--- a/src/lib/dhcpsrv/lease_mgr.cc
+++ b/src/lib/dhcpsrv/lease_mgr.cc
@@ -1973,7 +1973,6 @@ SflqPoolInfo::SflqPoolInfo():
     modified_ts_() {
 }
 
-
 data::ElementPtr
 SflqPoolInfo::toElement() const {
     ElementPtr info = Element::createMap();