From: Stephen Morris Date: Wed, 12 Sep 2012 14:58:00 +0000 (+0100) Subject: [1545] Minor changes as suggested by review X-Git-Tag: trac2351_base~70^2~3^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23ba7abb4e2fe826bf536c822fb7eef20ebcd689;p=thirdparty%2Fkea.git [1545] Minor changes as suggested by review --- diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes index 87b3d1a6f0..98e402da84 100644 --- 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 ce09f5313f..f677259947 100644 --- 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 f43bf09a6f..a3615319a7 100644 --- 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 3ef57fdb19..1cb323657a 100644 --- 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 f1ce8f704b..20287066da 100644 --- 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