[898-add-a-new-hook-to-support-bootp] Checkpoint: reviewed change and addressed comme...

diff --git a/doc/sphinx/arm/hooks-bootp.rst b/doc/sphinx/arm/hooks-bootp.rst
index b687d6c003d5d0f4cfbee28c2f8af643eae1f2e9..8c7d803170091f0a3b60fa6e0973dccd5f2bf572 100644 (file)
--- a/doc/sphinx/arm/hooks-bootp.rst
+++ b/doc/sphinx/arm/hooks-bootp.rst
@@ -1,4 +1,4 @@
-.. _hooks-bootp:
+.. _bootp-library:
 
 BOOTP support
 =============

diff --git a/src/hooks/dhcp/bootp/bootp_callouts.cc b/src/hooks/dhcp/bootp/bootp_callouts.cc
index 53684ea32a5062862973a0a86a0f8b3c5efcd930..565df2249c990dd3ea00c76db9ce279160792aeb 100644 (file)
--- a/src/hooks/dhcp/bootp/bootp_callouts.cc
+++ b/src/hooks/dhcp/bootp/bootp_callouts.cc
@@ -40,7 +40,6 @@ int buffer4_receive(CalloutHandle& handle) {
 
         if (copy->getType() != DHCP_NOTYPE) {
             // DHCP query.
-            query->addClass("DHCP");
             return (0);
         }
         if (copy->getOp() == BOOTREPLY) {

diff --git a/src/hooks/dhcp/bootp/tests/bootp_unittests.cc b/src/hooks/dhcp/bootp/tests/bootp_unittests.cc
index 04227d903dc96d29b139466619c28c68d4790c0f..d4ac831d2c9948b572af3fe71f0bc2de198664d2 100644 (file)
--- a/src/hooks/dhcp/bootp/tests/bootp_unittests.cc
+++ b/src/hooks/dhcp/bootp/tests/bootp_unittests.cc
@@ -124,7 +124,7 @@ TEST_F(BootpTest, dhcpOffer) {
 TEST_F(BootpTest, bootReply) {
     // The constructor does not allow to directly create a BOOTREPLY packet.
     Pkt4Ptr pkt(new Pkt4(DHCPOFFER, 12345));
-    //pkt->setType(DHCP_NOTYPE);
+    pkt->setType(DHCP_NOTYPE);
     pkt->delOption(DHO_DHCP_MESSAGE_TYPE);
     ASSERT_EQ(BOOTREPLY, pkt->getOp());
     calloutsCall(pkt, false);
@@ -134,7 +134,7 @@ TEST_F(BootpTest, bootReply) {
 TEST_F(BootpTest, bootRequest) {
     // The constructor does not allow to directly create a BOOTREQUEST packet.
     Pkt4Ptr pkt(new Pkt4(DHCPDISCOVER, 12345));
-    // pkt->setType(DHCP_NOTYPE);
+    pkt->setType(DHCP_NOTYPE);
     pkt->delOption(DHO_DHCP_MESSAGE_TYPE);
     ASSERT_EQ(BOOTREQUEST, pkt->getOp());
     calloutsCall(pkt, true);