From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 2 Jan 2014 17:13:34 +0000 (-0500)
Subject: [3207] A few more minor review changes.
X-Git-Tag: bind10-1.2.0beta1-release~167^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94be309810fb7f5964fa52c8348a12e100bd0428;p=thirdparty%2Fkea.git

[3207] A few more minor review changes.

Removed reponse packet type check from IPv6 packet_snd callout.
Corrected text in user chk doxygen page.
---

diff --git a/src/hooks/dhcp/user_chk/libdhcp_user_chk.dox b/src/hooks/dhcp/user_chk/libdhcp_user_chk.dox
index b2592d49d5..09d0e48ac9 100644
--- a/src/hooks/dhcp/user_chk/libdhcp_user_chk.dox
+++ b/src/hooks/dhcp/user_chk/libdhcp_user_chk.dox
@@ -101,9 +101,9 @@ following two entries:
 
     - "type" whose value is "HW_ADDR" for IPv4 users or "DUID" for IPv6 users
     - "id" whose value is either the hardware address or the DUID from the
-    request formatted as a sring of hex digits, with or without ":" delimiters.
+    request formatted as a string of hex digits, with or without ":" delimiters.
 
-and may have the one or more of the following entries:
+and may have the zero or more of the following entries:
 
     - "bootfile" whose value is the pathname of the desired file
     - "tftp_server" whose value is the hostname or IP address of the desired
diff --git a/src/hooks/dhcp/user_chk/pkt_send_co.cc b/src/hooks/dhcp/user_chk/pkt_send_co.cc
index e13ea1be9e..805333bd30 100644
--- a/src/hooks/dhcp/user_chk/pkt_send_co.cc
+++ b/src/hooks/dhcp/user_chk/pkt_send_co.cc
@@ -149,15 +149,6 @@ int pkt6_send(CalloutHandle& handle) {
         Pkt6Ptr response;
         handle.getArgument("response6", response);
 
-        // @todo Determine list of types to process and skip the rest.
-        uint8_t packet_type = response->getType();
-        if (packet_type == DHCPV6_DECLINE) {
-            std::cout << "DHCP UserCheckHook : pkt6_send"
-                      << "skipping packet type: "
-                      << static_cast<int>(packet_type) << std::endl;
-            return (0);
-        }
-
         // Fetch the lease address as a string
         std::string addr_str = getV6AddrStr(response);
         if (addr_str.empty()) {