From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 1 Mar 2018 15:06:46 +0000 (-0500)
Subject: [5553] Addressed review comments
X-Git-Tag: ha_checkpoints12~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4620886020826d9a9703cd97ae06ce5cb129355;p=thirdparty%2Fkea.git

[5553] Addressed review comments

    Adjusted for addition DHCP types, changed log
    message to INFO level.
---

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index ead5560ccb..87ca9d0cef 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -2847,12 +2847,13 @@ Dhcpv4Srv::acceptMessageType(const Pkt4Ptr& query) const {
             break;
 
         case DHCP_NOTYPE:
-            LOG_DEBUG(bad_packet4_logger, DBG_DHCP4_DETAIL, DHCP4_PACKET_DROP_0009)
-                      .arg(query->getLabel());
+            LOG_INFO(bad_packet4_logger, DHCP4_PACKET_DROP_0009)
+                     .arg(query->getLabel());
             break;
+
         default:
             // If we receive a message with a non-existing type, we are logging it.
-            if (type > DHCPLEASEQUERYDONE) {
+            if (type >= DHCP_TYPES_EOF) {
                 LOG_DEBUG(bad_packet4_logger, DBG_DHCP4_DETAIL, DHCP4_PACKET_DROP_0005)
                           .arg(query->getLabel())
                           .arg(type);
diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index a2bdd6fd7f..e1d14878f5 100644
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -3999,7 +3999,7 @@ TEST_F(Dhcpv4SrvTest, acceptMessageType) {
     ASSERT_EQ(DHCP_NOTYPE, pkt->getType());
     EXPECT_FALSE(srv.acceptMessageType(Pkt4Ptr(new Pkt4(&bin[0], bin.size()))));
 
-    // Verify that we drop packets with types > DHCPLEASEQUERYDONE
+    // Verify that we drop packets with types >= DHCP_TYPES_EOF
     // Make Discover with type changed to 0xff
     std::vector<uint8_t> bin2;
     const char* invalid_msg_type =
@@ -4022,6 +4022,8 @@ TEST_F(Dhcpv4SrvTest, acceptMessageType) {
 
     bin.clear();
     isc::util::encode::decodeHex(invalid_msg_type, bin);
+
+    std::cout << "bin[32]: " << (int)(bin[32]) << std::endl;
     pkt.reset(new Pkt4(&bin[0], bin.size()));
     pkt->unpack();
     ASSERT_EQ(0xff, pkt->getType());
diff --git a/src/lib/dhcp/dhcp4.h b/src/lib/dhcp/dhcp4.h
index 8fd8297ea9..56d2586f68 100644
--- a/src/lib/dhcp/dhcp4.h
+++ b/src/lib/dhcp/dhcp4.h
@@ -239,10 +239,11 @@ enum DHCPMessageType {
     DHCPLEASEUNKNOWN    =  12,
     DHCPLEASEACTIVE     =  13,
     DHCPBULKLEASEQUERY  =  14,
-    DHCPLEASEQUERYDONE  =  15
+    DHCPLEASEQUERYDONE  =  15,
 // DHCPACTIVELEASEQUERY =  16,
-// DHCPLEASEQUERYSTATUS =  17,
-// DHCPTLS              =  18
+    DHCPLEASEQUERYSTATUS =  17,
+    DHCPTLS              =  18,
+    DHCP_TYPES_EOF
 };
 
 static const uint16_t DHCP4_CLIENT_PORT = 68;