fixed warnings

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 4b2783c1282a77ef4b7c7884fc9899c8d9576733..1f907bbba969e23b61451bec7edb55c29085f4c5 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -447,9 +447,9 @@ const std::string Dhcpv4Srv::VENDOR_CLASS_PREFIX("VENDOR_CLASS_");
 Dhcpv4Srv::Dhcpv4Srv(uint16_t server_port, uint16_t client_port,
                      bool run_multithreaded /* = false */,
                      const bool use_bcast, const bool direct_response_desired)
-    : io_service_(new IOService()), shutdown_(true), alloc_engine_(),
-      server_port_(server_port), use_bcast_(use_bcast),
-      client_port_(client_port),
+    : io_service_(new IOService()), server_port_(server_port),
+      client_port_(client_port), use_bcast_(use_bcast),
+      shutdown_(true), alloc_engine_(),
       network_state_(new NetworkState(NetworkState::DHCPv4)),
       cb_control_(new CBControlDHCPv4()),
       run_multithreaded_(run_multithreaded) {

diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 7364f74df29f25c2e510407f3354c55a7471d45a..7744d69ddac8df32d4e2e0bee45677a645b5274b 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -901,10 +901,6 @@ protected:
                                           bool& drop,
                                           bool sanity_only = false) const;
 
-    /// indicates if shutdown is in progress. Setting it to true will
-    /// initiate server shutdown procedure.
-    volatile bool shutdown_;
-
     /// @brief dummy wrapper around IfaceMgr::receive4
     ///
     /// This method is useful for testing purposes, where its replacement
@@ -1003,14 +999,18 @@ private:
     /// UDP port number on which server listens.
     uint16_t server_port_;
 
-    /// Should broadcast be enabled on sockets (if true).
-    bool use_bcast_;
-
 protected:
 
     /// UDP port number to which server sends responses.
     uint16_t client_port_;
 
+    /// Should broadcast be enabled on sockets (if true).
+    bool use_bcast_;
+
+    /// indicates if shutdown is in progress. Setting it to true will
+    /// initiate server shutdown procedure.
+    volatile bool shutdown_;
+
     /// @brief Allocation Engine.
     /// Pointer to the allocation engine that we are currently using
     /// It must be a pointer, because we will support changing engines

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 16faac53ea3812dcca6dfe195503eb73fc291f45..4c48d70be0f530bf08781e65fafc7cf1a1a7e17a 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -184,8 +184,9 @@ const std::string Dhcpv6Srv::VENDOR_CLASS_PREFIX("VENDOR_CLASS_");
 Dhcpv6Srv::Dhcpv6Srv(uint16_t server_port, uint16_t client_port,
                      bool run_multithreaded /* = false */)
     : io_service_(new IOService()), server_port_(server_port),
-      client_port_(client_port), serverid_(), shutdown_(true),
-      alloc_engine_(), name_change_reqs_(),
+      client_port_(client_port), serverid_(),
+      shutdown_(true), alloc_engine_(),
+      name_change_reqs_(),
       network_state_(new NetworkState(NetworkState::DHCPv6)),
       cb_control_(new CBControlDHCPv6()),
       run_multithreaded_(run_multithreaded) {