diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml index 0fc18895bb..4a116c39e1 100644 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@ -2727,13 +2727,13 @@ It is merely echoed by the server The server does not decrease assigned-addresses statistics when DHCPDECLINE is received and processed successfully. While - technically declined address is not assigned anymore, the primary usage - of assigned-addresses statistic is to monitor pool utilization. Most + technically a declined address is no longer assigned, the primary usage + of the assigned-addresses statistic is to monitor pool utilization. Most people would forget to include declined-addresses in the calculation, and simply do assigned-addresses/total-addresses. This would have a bias towards under-representing pool utilization. As this has a - potential for major issues, we decided to decrease assigned - addresses not immediately after receiving DHCPDECLINE, but do + potential for major issues, we decided not to decrease assigned + addresses immediately after receiving DHCPDECLINE, but to do it later when we recover the address back to the available pool. diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes index 1e91f063a8..eafa754fc8 100644 --- a/src/bin/dhcp4/dhcp4_messages.mes +++ b/src/bin/dhcp4/dhcp4_messages.mes @@ -194,7 +194,7 @@ detected as a duplicate (i.e. another device in the network is using this addres However, the server does not have a record for this address. This may indicate a client's error or a server's purged database. -% DHCP4_DECLINE_LEASE_MISMATCH Received DHCPDECLINE for addr %1 from %2, but the data doesn't match: received hwaddr: %3, lease hwaddr: %4, received client-id: %5, lease client-id: %6 +% DHCP4_DECLINE_LEASE_MISMATCH Received DHCPDECLINE for addr %1 from client %2, but the data doesn't match: received hwaddr: %3, lease hwaddr: %4, received client-id: %5, lease client-id: %6 This informational message means that a client attempted to report his address as declined (i.e. used by unknown entity). The server has information about a lease for that address, but the client's hardware address or client identifier diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc index 551268ce31..44b036db93 100644 --- a/src/bin/dhcp4/dhcp4_srv.cc +++ b/src/bin/dhcp4/dhcp4_srv.cc @@ -1936,8 +1936,8 @@ Dhcpv4Srv::declineLease(const Lease4Ptr& lease, const std::string& descr) { StatsMgr::instance().addValue("declined-addresses", static_cast(1)); // We do not want to decrease the assigned-addresses at this time. While - // technically declined address is not allocated anymore, the primary usage - // of assigned-addresses statistic is to monitor pool utilization. Most + // technically a declined address is no longer allocated, the primary usage + // of the assigned-addresses statistic is to monitor pool utilization. Most // people would forget to include declined-addresses in the calculation, // and simply do assigned-addresses/total-addresses. This would have a bias // towards under-representing pool utilization, if we decreased allocated diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h index 86ec443b49..142ee44529 100644 --- a/src/bin/dhcp4/dhcp4_srv.h +++ b/src/bin/dhcp4/dhcp4_srv.h @@ -405,7 +405,7 @@ protected: /// @brief Process incoming DHCPDECLINE messages. /// /// This method processes incoming DHCPDECLINE. In particular, it extracts - /// Requested IP Address option, check that the address really belongs to + /// Requested IP Address option, checks that the address really belongs to /// the client and if it does, calls @ref declineLease. /// /// @param decline message received from client diff --git a/src/bin/dhcp4/tests/decline_unittest.cc b/src/bin/dhcp4/tests/decline_unittest.cc index 2c1175fc01..2252c3141e 100644 --- a/src/bin/dhcp4/tests/decline_unittest.cc +++ b/src/bin/dhcp4/tests/decline_unittest.cc @@ -197,7 +197,7 @@ DeclineTest::acquireAndDecline(const std::string& hw_address_1, uint64_t after_global = declined_global->getInteger().first; ASSERT_TRUE(lease); - // We check if the deline process was successful by checking if the + // We check if the decline process was successful by checking if the // lease is in the database and what is its state. if (expected_result == SHOULD_PASS) { EXPECT_EQ(Lease::STATE_DECLINED, lease->state_);