[#1836] addressed comments

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index e406982cf62683af7fb58f2af841c557f074ca00..3a7a1feba9340da6e86f978d1ee89f8584b65622 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -5806,10 +5806,10 @@ address of the interface on which the message from the client (or relay)
 has been received. A single server instance will use multiple server
 identifiers if it is receiving queries on multiple interfaces.
 
-It is possible to override the default server identifier values by
-specifying the "dhcp-server-identifier" option. This option is only
-supported at the global, shared network, and subnet levels; it must not
-be specified on the client class or host reservation levels.
+It is possible to override the default server identifier values by specifying
+the "dhcp-server-identifier" option. This option configuration is only supported
+at the subnet, shared network, client class and global levels; it must not be
+specified on the host reservation levels.
 
 The following example demonstrates how to override the server identifier
 for a subnet:

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index a04dbaaf63a2799f7adb8a58e90e9c0d58d129d5..7cb4a1b635c0170380db5deabf2d683997cae295 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -3662,14 +3662,13 @@ Dhcpv4Srv::acceptServerId(const Pkt4Ptr& query) const {
     // anywhere. This should be good enough to eliminate exchanges
     // with other servers in the same network.
 
-    /// @todo Currently we only check subnet identifiers configured on the
-    /// subnet level, shared network level and global level. This should
-    /// be sufficient for most of cases. At this point, trying to support
-    /// server identifiers on the class level seems to be an overkill and
-    /// is probably not needed. Same with host reservations. In fact,
-    /// at this point we don't know the reservations for the client
-    /// communicating with the server. We may revise some of these choices
-    /// in the future.
+    /// @todo Currently we only check server identifiers configured on the
+    /// subnet level, shared network level, client class level and global level.
+    /// This should be sufficient for most of cases. At this point, trying to
+    /// support server identifiers on the host reservations level seems to be an
+    /// overkill and is probably not needed. In fact, at this point we don't
+    /// know the reservations for the client communicating with the server.
+    /// We may revise some of these choices in the future.
 
     SrvConfigPtr cfg = CfgMgr::instance().getCurrentCfg();
 

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index 7c3d1cfe672e6312de697a3b00db21f67f18437e..12788780762991d75ee44b70f6c0834823ce9446 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -374,10 +374,10 @@ Dhcpv4SrvTest::makeServerIdOption(const IOAddress& address) {
 
 void
 Dhcpv4SrvTest::checkAddressParams(const Pkt4Ptr& rsp,
-                                       const Subnet4Ptr subnet,
-                                       bool t1_present,
-                                       bool t2_present,
-                                       uint32_t expected_valid) {
+                                  const Subnet4Ptr subnet,
+                                  bool t1_present,
+                                  bool t2_present,
+                                  uint32_t expected_valid) {
 
     // Technically inPool implies inRange, but let's be on the safe
     // side and check both.
@@ -427,7 +427,7 @@ Dhcpv4SrvTest::checkAddressParams(const Pkt4Ptr& rsp,
 
 void
 Dhcpv4SrvTest::checkResponse(const Pkt4Ptr& rsp, int expected_message_type,
-                                  uint32_t expected_transid) {
+                             uint32_t expected_transid) {
     ASSERT_TRUE(rsp);
     EXPECT_EQ(expected_message_type,
               static_cast<int>(rsp->getType()));
@@ -435,10 +435,8 @@ Dhcpv4SrvTest::checkResponse(const Pkt4Ptr& rsp, int expected_message_type,
 }
 
 Lease4Ptr
-Dhcpv4SrvTest::checkLease(const Pkt4Ptr& rsp,
-                                    const OptionPtr& client_id,
-                                    const HWAddrPtr&,
-                                    const IOAddress& expected_addr) {
+Dhcpv4SrvTest::checkLease(const Pkt4Ptr& rsp, const OptionPtr& client_id,
+                          const HWAddrPtr&, const IOAddress& expected_addr) {
 
     ClientIdPtr id;
     if (client_id) {

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.h b/src/bin/dhcp4/tests/dhcp4_test_utils.h
index e56175652431f6fa1e459fa1fe07890108acc0c1..73162c40c2fa847298e88af35f8debd85b1b59b3 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.h
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.h
@@ -514,7 +514,7 @@ public:
     ///
     /// @param expected_server_id expected server identifier
     /// @param query the query used to get associated client classes
-    /// @param query the requested the requested address
+    /// @param requested the requested address
     /// @param server_id server identifier
     void buildCfgOptionTest(isc::asiolink::IOAddress expected_server_id,
                             Pkt4Ptr& query,