minor changes

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 1aacafdaa0e5f16e6f5807ccad53db4117117ab8..39903820de9695e4926afb892f63a7099b0771c0 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -775,8 +775,7 @@ Dhcpv4Srv::run() {
     if (run_multithreaded_) {
         // Creating the process packet thread pool
         // The number of thread pool's threads should be read from configuration
-        // file or it should be determined by the number of hardware threads and
-        // the number of Cassandra DB nodes.
+        // file or it should be determined by the number of hardware threads.
         pkt_thread_pool_.create(Dhcpv4Srv::threadCount());
     }
 

diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 8b9748f7b838826ad9eff450bb196e83565c50b7..3bd088c5126e31cc2466df04078b3edf54036b4a 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -167,12 +167,16 @@ private:
 
     /// @brief Pointer to the allocation engine used by the server.
     AllocEnginePtr alloc_engine_;
+
     /// @brief Pointer to the DHCPv4 message sent by the client.
     Pkt4Ptr query_;
+
     /// @brief Pointer to the DHCPv4 message to be sent to the client.
     Pkt4Ptr resp_;
+
     /// @brief Context for use with allocation engine.
     AllocEngine::ClientContext4Ptr context_;
+
     /// @brief Configured option list.
     /// @note The configured option list is an *ordered* list of
     /// @c CfgOption objects used to append options to the response.
@@ -615,7 +619,8 @@ protected:
     /// @param lease lease being assigned to the client
     /// @param subnet the subnet to which the lease belongs
     /// @param resp outbound response for the client to which timers are added.
-    static void setTeeTimes(const Lease4Ptr& lease, const Subnet4Ptr& subnet, Pkt4Ptr resp);
+    static void setTeeTimes(const Lease4Ptr& lease, const Subnet4Ptr& subnet,
+                            Pkt4Ptr resp);
 
     /// @brief Append basic options if they are not present.
     ///
@@ -1023,6 +1028,7 @@ protected:
     /// It must be a pointer, because we will support changing engines
     /// during normal operation (e.g. to use different allocators)
     boost::shared_ptr<AllocEngine> alloc_engine_;
+
     /// @brief Holds information about disabled DHCP service and/or
     /// disabled subnet/network scopes.
     NetworkStatePtr network_state_;

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 116fe3cc766a4e5f1d6e957c718319230ac83f6b..49b7d14aed1ae5d39c7f3c5a70ae19553d1c3bac 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -451,8 +451,7 @@ bool Dhcpv6Srv::run() {
     if (run_multithreaded_) {
         // Creating the process packet thread pool
         // The number of thread pool's threads should be read from configuration
-        // file or it should be determined by the number of hardware threads and
-        // the number of Cassandra DB nodes.
+        // file or it should be determined by the number of hardware threads.
         pkt_thread_pool_.create(Dhcpv6Srv::threadCount());
     }
 

diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index 8828f3953583c3dc613fbdcd2f88275531fc11b9..8c2765ec840800d881421e2283a69bcd6ab21e95 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -759,7 +759,8 @@ protected:
     /// @param preferred_lft preferred lease time of the lease being assigned to the client
     /// @param subnet the subnet to which the lease belongs
     /// @param resp outbound IA option in which the timers are set.
-    static void setTeeTimes(uint32_t preferred_lft, const Subnet6Ptr& subnet, Option6IAPtr& resp);
+    static void setTeeTimes(uint32_t preferred_lft, const Subnet6Ptr& subnet,
+                            Option6IAPtr& resp);
 
     /// @brief Attempts to release received addresses
     ///
@@ -916,9 +917,9 @@ public:
     /// @param ia specific IA_NA option to process.
     /// @param new_leases a collection of leases being declined.
     /// @return IA_NA option with response (to be included in Reply message)
-    OptionPtr
-    declineIA(const Pkt6Ptr& decline, const DuidPtr& duid, int& general_status,
-              boost::shared_ptr<Option6IA> ia, Lease6Collection& new_leases);
+    OptionPtr declineIA(const Pkt6Ptr& decline, const DuidPtr& duid,
+                        int& general_status, boost::shared_ptr<Option6IA> ia,
+                        Lease6Collection& new_leases);
 
     /// @brief Declines specific IPv6 lease.
     ///