From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 16 Jul 2013 11:25:31 +0000 (+0200)
Subject: [2994] Minor dhcpv6 corrections:
X-Git-Tag: bind10-1.2.0beta1-release~333^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01bb436c45f4d92a3575ff4ad2f5c1cb348ce399;p=thirdparty%2Fkea.git

[2994] Minor dhcpv6 corrections:

 - not used function removed
 - DHCP6_HOOK_PACKET_RCVD_SKIP message typo fixed
---

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 95fb3864ab..2f30c4c45d 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -66,7 +66,7 @@ is started.  It indicates what database backend type is being to store
 lease and other information.
 
 % DHCP6_HOOK_PACKET_RCVD_SKIP received DHCPv6 packet was dropped, because a callout set skip flag.
-This debug message is printed when a callout installed on pkt6_received
+This debug message is printed when a callout installed on pkt6_receive
 hook point sets skip flag. For this particular hook point, the setting
 of the flag by a callout instructs the server to drop the packet.
 
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 7957ed4558..d2cf1777b8 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -34,7 +34,6 @@
 #include <dhcpsrv/utils.h>
 #include <util/buffer.h>
 #include <util/range_utilities.h>
-
 #include <hooks/server_hooks.h>
 #include <hooks/hooks_manager.h>
 
@@ -1855,26 +1854,6 @@ TEST_F(Dhcpv6SrvTest, Hooks) {
     EXPECT_TRUE(hook_index_pkt6_send > 0);
 }
 
-// This function returns buffer for empty packet (just DHCPv6 header)
-Pkt6* captureEmpty() {
-    Pkt6* pkt;
-    uint8_t data[4];
-    data[0] = 1; // type 1 = SOLICIT
-    data[1] = 0xca; // trans-id = 0xcafe01
-    data[2] = 0xfe;
-    data[3] = 0x01;
-
-    pkt = new Pkt6(data, sizeof(data));
-    pkt->setRemotePort(546);
-    pkt->setRemoteAddr(IOAddress("fe80::1"));
-    pkt->setLocalPort(0);
-    pkt->setLocalAddr(IOAddress("ff02::1:2"));
-    pkt->setIndex(2);
-    pkt->setIface("eth0");
-
-    return (pkt);
-}
-
 // This function returns buffer for very simple Solicit
 Pkt6* captureSimpleSolicit() {
     Pkt6* pkt;