From: Francis Dupont <fdupont@isc.org>
Date: Fri, 8 May 2020 22:00:32 +0000 (+0200)
Subject: [#1215] Added missing DHCPv4 message types
X-Git-Tag: Kea-1.7.8~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e97104d36ae06e7ff8ffcfe596a0a1681cb9a71;p=thirdparty%2Fkea.git

[#1215] Added missing DHCPv4 message types
---

diff --git a/src/lib/dhcp/pkt4.cc b/src/lib/dhcp/pkt4.cc
index 501bf812da..cd634ca3b6 100644
--- a/src/lib/dhcp/pkt4.cc
+++ b/src/lib/dhcp/pkt4.cc
@@ -286,6 +286,14 @@ Pkt4::getName(const uint8_t type) {
     static const char* DHCPNAK_NAME = "DHCPNAK";
     static const char* DHCPRELEASE_NAME = "DHCPRELEASE";
     static const char* DHCPINFORM_NAME = "DHCPINFORM";
+    static const char* DHCPLEASEQUERY_NAME = "DHCPLEASEQUERY";
+    static const char* DHCPLEASEUNASSIGNED_NAME = "DHCPLEASEUNASSIGNED";
+    static const char* DHCPLEASEUNKNOWN_NAME = "DHCPLEASEUNKNOWN";
+    static const char* DHCPLEASEACTIVE_NAME = "DHCPLEASEACTIVE";
+    static const char* DHCPBULKLEASEQUERY_NAME = "DHCPBULKLEASEQUERY";
+    static const char* DHCPLEASEQUERYDONE_NAME = "DHCPLEASEQUERYDONE";
+    static const char* DHCPLEASEQUERYSTATUS_NAME = "DHCPLEASEQUERYSTATUS";
+    static const char* DHCPTLS_NAME = "DHCPTLS";
     static const char* UNKNOWN_NAME = "UNKNOWN";
 
     switch (type) {
@@ -313,6 +321,30 @@ Pkt4::getName(const uint8_t type) {
         case DHCPINFORM:
             return (DHCPINFORM_NAME);
 
+        case DHCPLEASEQUERY:
+            return (DHCPLEASEQUERY_NAME);
+
+        case DHCPLEASEUNASSIGNED:
+            return (DHCPLEASEUNASSIGNED_NAME);
+
+        case DHCPLEASEUNKNOWN:
+            return (DHCPLEASEUNKNOWN_NAME);
+
+        case DHCPLEASEACTIVE:
+            return (DHCPLEASEACTIVE_NAME);
+
+        case DHCPBULKLEASEQUERY:
+            return (DHCPBULKLEASEQUERY_NAME);
+
+        case DHCPLEASEQUERYDONE:
+            return (DHCPLEASEQUERYDONE_NAME);
+
+        case DHCPLEASEQUERYSTATUS:
+            return (DHCPLEASEQUERYSTATUS_NAME);
+
+        case DHCPTLS:
+            return (DHCPTLS_NAME);
+
         default:
             ;
     }
diff --git a/src/lib/dhcp/tests/pkt4_unittest.cc b/src/lib/dhcp/tests/pkt4_unittest.cc
index f33d1c001d..767a8fb70d 100644
--- a/src/lib/dhcp/tests/pkt4_unittest.cc
+++ b/src/lib/dhcp/tests/pkt4_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2019 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2020 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1120,6 +1120,38 @@ TEST_F(Pkt4Test, getName) {
             EXPECT_STREQ("DHCPINFORM", Pkt4::getName(type));
             break;
 
+        case DHCPLEASEQUERY:
+            EXPECT_STREQ("DHCPLEASEQUERY", Pkt4::getName(type));
+            break;
+
+        case DHCPLEASEUNASSIGNED:
+            EXPECT_STREQ("DHCPLEASEUNASSIGNED", Pkt4::getName(type));
+            break;
+
+        case DHCPLEASEUNKNOWN:
+            EXPECT_STREQ("DHCPLEASEUNKNOWN", Pkt4::getName(type));
+            break;
+
+        case DHCPLEASEACTIVE:
+            EXPECT_STREQ("DHCPLEASEACTIVE", Pkt4::getName(type));
+            break;
+
+        case DHCPBULKLEASEQUERY:
+            EXPECT_STREQ("DHCPBULKLEASEQUERY", Pkt4::getName(type));
+            break;
+
+        case DHCPLEASEQUERYDONE:
+            EXPECT_STREQ("DHCPLEASEQUERYDONE", Pkt4::getName(type));
+            break;
+
+        case DHCPLEASEQUERYSTATUS:
+            EXPECT_STREQ("DHCPLEASEQUERYSTATUS", Pkt4::getName(type));
+            break;
+
+        case DHCPTLS:
+            EXPECT_STREQ("DHCPTLS", Pkt4::getName(type));
+            break;
+
         default:
             EXPECT_STREQ("UNKNOWN", Pkt4::getName(type));
         }