From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 2 Aug 2013 11:15:58 +0000 (-0400)
Subject: [2264] Addressed review comments.
X-Git-Tag: bind10-1.2.0beta1-release~303^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27d057a79de7e769cef2a87e59e08807491bf44e;p=thirdparty%2Fkea.git

[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 5af51f9d0d..f70dde329f 100644
--- 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 f85fcb4b82..feb332e6fd 100644
--- 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 98d54835fe..9ace94a070 100644
--- 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 2688792050..70836ae92b 100644
--- 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.