[2264] Addressed review comments.

Removed obsoleted error messages, altered exception by Packet6::packTCP to
be NotImplemented rather than Unexpected.  Corrected method commentary.

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 5af51f9d0d576aca7552064cd1429e2c85cf6126..f70dde329fc2e401401fe48b426a22c4e1b796f1 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -149,11 +149,6 @@ This error is output if the IPv4 DHCP server fails to send an assembled
 DHCP message to a client. The reason for the error is included in the
 message.
 
-% 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.  The cause is most likely
-to be a programming error: please raise a bug report.
-
 % DHCP4_PARSER_COMMIT_EXCEPTION parser failed to commit changes
 On receipt of message containing details to a change of the IPv4 DHCP
 server configuration, a set of parsers were successfully created, but one

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index f85fcb4b823cded41ecd780cc9f96e23274ac21c..feb332e6fd49aefab052472ec1a94ad614c39882 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -165,11 +165,6 @@ This error is output if the IPv6 DHCP server fails to send an assembled
 DHCP message to a client. The reason for the error is included in the
 message.
 
-% 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.  The reason is most likely
-to be to a programming error: please raise a bug report.
-
 % DHCP6_PARSER_COMMIT_EXCEPTION parser failed to commit changes
 On receipt of message containing details to a change of the IPv6 DHCP
 server configuration, a set of parsers were successfully created, but one

diff --git a/src/lib/dhcp/pkt6.cc b/src/lib/dhcp/pkt6.cc
index 98d54835fe8bf4a47cc3cf60455af462c5df1f57..9ace94a0709f6fa01ea284aeec1100ab2308fccf 100644 (file)
--- a/src/lib/dhcp/pkt6.cc
+++ b/src/lib/dhcp/pkt6.cc
@@ -261,7 +261,7 @@ Pkt6::packUDP() {
 void
 Pkt6::packTCP() {
     /// TODO Implement this function.
-    isc_throw(Unexpected, "DHCPv6 over TCP (bulk leasequery and failover)"
+    isc_throw(NotImplemented, "DHCPv6 over TCP (bulk leasequery and failover)"
               "not implemented yet.");
 }
 

diff --git a/src/lib/dhcp/pkt6.h b/src/lib/dhcp/pkt6.h
index 2688792050c20fe1b8e2e509116ee3a915baede5..70836ae92bbd4aaebc39a01edffc3237624e75ae 100644 (file)
--- a/src/lib/dhcp/pkt6.h
+++ b/src/lib/dhcp/pkt6.h
@@ -117,7 +117,7 @@ public:
     /// will be set in data_len_.
     ///
     /// @throw BadValue if packet protocol is invalid, InvalidOperation
-    /// if packing fails, or Unexpected if protocol is TCP (IPv6 over TCP is 
+    /// if packing fails, or NotImplemented if protocol is TCP (IPv6 over TCP is
     /// not yet supported).
     void pack();
 
@@ -417,12 +417,12 @@ protected:
     ///
     /// TODO This function is not implemented yet.
     ///
-    /// Method with throw exception if build fails
+    /// @throw NotImplemented, IPv6 over TCP is not yet supported.
     void packTCP();
 
     /// Builds on wire packet for UDP transmission.
     ///
-    /// Method with throw exception if build fails
+    /// @throw InvalidOperation if packing fails
     void packUDP();
 
     /// @brief Parses on-wire form of TCP DHCPv6 packet.