[1545] Minor changes as suggested by review

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 87b3d1a6f09da4adee7b53a963d67cd41fd71a85..98e402da8483c4c9b8e98153ea1ee0846c5b3add 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -40,7 +40,7 @@ server is about to open sockets on the specified port.
 
 % DHCP4_PACKET_PARSE_FAIL failed to parse incoming packet: %1
 The IPv4 DHCP server has received a packet that it is unable to
-interpret. The reason why the packet is invalid is include in the message.
+interpret. The reason why the packet is invalid is included in the message.
 
 % DHCP4_PACKET_RECEIVED %1 (type %2) packet received on interface %3
 A debug message noting that the server has received the specified type of
@@ -50,8 +50,8 @@ may well be a valid DHCP packet, just a type not expected by the server
 
 % DHCP4_PACK_FAIL failed to assemble response correctly
 This error is output if the server failed to assemble the data to be
-returned to the client into a valid packet.  Additional messages will
-detail the reason.
+returned to the client into a valid packet.  The cause is most likely
+to be a programming error: please raise a bug report.
 
 % DHCP4_QUERY_DATA received packet type %1, data is <%2>
 A debug message listing the data received from the client.

diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index ce09f5313faa3da97ef2fbc0f519c3ffe40a3218..f677259947961c68813733decf072e455efb83f2 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -44,7 +44,7 @@ class Dhcpv4Srv : public boost::noncopyable {
     public:
     /// @brief Default constructor.
     ///
-    /// Instantiates necessary services, required to run DHCPv6 server.
+    /// Instantiates necessary services, required to run DHCPv4 server.
     /// In particular, creates IfaceMgr that will be responsible for
     /// network interaction. Will instantiate lease manager, and load
     /// old or create new DUID. It is possible to specify alternate
@@ -54,7 +54,7 @@ class Dhcpv4Srv : public boost::noncopyable {
     /// @param port specifies port number to listen on
     Dhcpv4Srv(uint16_t port = DHCP4_SERVER_PORT);
 
-    /// @brief Destructor. Used during DHCPv6 service shutdown.
+    /// @brief Destructor. Used during DHCPv4 service shutdown.
     ~Dhcpv4Srv();
 
     /// @brief Main server processing loop.
@@ -75,7 +75,7 @@ class Dhcpv4Srv : public boost::noncopyable {
     /// Returns the name of valid packet received by the server (e.g. DISCOVER).
     /// If the packet is unknown - or if it is a valid DHCP packet but not one
     /// expected to be received by the server (such as an OFFER), the string
-    /// "UNKNOWN" is returned.  This methos is used in debug messages.
+    /// "UNKNOWN" is returned.  This method is used in debug messages.
     ///
     /// As the operation of the method does not depend on any server state, it
     /// is declared static.
@@ -106,11 +106,11 @@ protected:
     /// is valid, not expired, not reserved, not used by other client and
     /// that requesting client is allowed to use it.
     ///
-    /// Returns ACK message, NACK message, or NULL
+    /// Returns ACK message, NAK message, or NULL
     ///
     /// @param request a message received from client
     ///
-    /// @return ACK or NACK message
+    /// @return ACK or NAK message
     Pkt4Ptr processRequest(Pkt4Ptr& request);
 
     /// @brief Stub function that will handle incoming RELEASE messages.

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index f43bf09a6f39522769e2954e5be1924201c6ebdb..a3615319a7d4c00b4945ce1c4f93945a3e86239b 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -53,8 +53,8 @@ a received OFFER packet as UNKNOWN).
 
 % DHCP6_PACK_FAIL failed to assemble response correctly
 This error is output if the server failed to assemble the data to be
-returned to the client into a valid packet.  Additional messages will
-detail the reason.
+returned to the client into a valid packet.  The reason is most likely
+to be to a programming error: please raise a bug report.
 
 % DHCP6_QUERY_DATA received packet length %1, data length %2, data is <%3>
 A debug message listing the data received from the client or relay.

diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index 3ef57fdb199bdbe5c465e6cb92d1cb4ec870a60f..1cb323657a3d2769693ca026bf0ec09fb1c791eb 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -72,10 +72,10 @@ public:
 
     /// @brief Return textual type of packet received by server
     ///
-    /// Returns the name of valid packet received by the server (e.g. DISCOVER).
+    /// Returns the name of valid packet received by the server (e.g. SOLICIT).
     /// If the packet is unknown - or if it is a valid DHCP packet but not one
-    /// expected to be received by the server (such as an OFFER), the string
-    /// "UNKNOWN" is returned.  This methos is used in debug messages.
+    /// expected to be received by the server (such as an ADVERTISE), the string
+    /// "UNKNOWN" is returned.  This method is used in debug messages.
     ///
     /// As the operation of the method does not depend on any server state, it
     /// is declared static.

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index f1ce8f704b47bfde429f229a12f49c0b336e64c7..20287066dabccea86a721618523eec586bd95421 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -268,4 +268,4 @@ TEST_F(Dhcpv6SrvTest, serverReceivedPacketName) {
     }
 }
 
-}   // anonymous namespace
+}   // end of anonymous namespace