From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 16 Jun 2020 14:37:49 +0000 (-0400)
Subject: [#1235] Addressed review comments
X-Git-Tag: Kea-1.7.9~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d436217cee8e3f5b674829f29f2b18a68d2ad081;p=thirdparty%2Fkea.git

[#1235] Addressed review comments

src/lib/dhcp/libdhcp++.cc
src/lib/dhcp/std_option_defs.h
    Removed LQ_QUERY_OPTION_SPACE, using DHCP6_OPTION_SPACE instead

src/lib/dhcp/tests/libdhcp++_unittest.cc
    Updated unit test

src/lib/dhcpsrv/cfg_duid.*
    CfgDUID::create() - reset the internal DUID value
---

diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index 994e7a638a..6a6ba1344b 100644
--- a/src/lib/dhcp/libdhcp++.cc
+++ b/src/lib/dhcp/libdhcp++.cc
@@ -50,7 +50,6 @@ const OptionDefParamsEncapsulation OPTION_DEF_PARAMS[] = {
     { LW_V6_OPTION_DEFINITIONS,             LW_V6_OPTION_DEFINITIONS_SIZE,           LW_V6_OPTION_SPACE          },
     { V4V6_RULE_OPTION_DEFINITIONS,         V4V6_RULE_OPTION_DEFINITIONS_SIZE,       V4V6_RULE_OPTION_SPACE      },
     { V4V6_BIND_OPTION_DEFINITIONS,         V4V6_BIND_OPTION_DEFINITIONS_SIZE,       V4V6_BIND_OPTION_SPACE      },
-    { LQ_QUERY_OPTION_DEFINITIONS,          LQ_QUERY_OPTION_DEFINITIONS_SIZE,        LQ_QUERY_OPTION_SPACE       },
     { LAST_RESORT_V4_OPTION_DEFINITIONS,    LAST_RESORT_V4_OPTION_DEFINITIONS_SIZE,  LAST_RESORT_V4_OPTION_SPACE },
     { NULL,                                 0,                                       ""                          }
 };
diff --git a/src/lib/dhcp/std_option_defs.h b/src/lib/dhcp/std_option_defs.h
index 8142140dd0..9c08a1d215 100644
--- a/src/lib/dhcp/std_option_defs.h
+++ b/src/lib/dhcp/std_option_defs.h
@@ -27,7 +27,6 @@
 #define DHCP_AGENT_OPTION_SPACE          "dhcp-agent-options-space"
 #define VENDOR_OPTION_SPACE              "vendor-opts-space"
 #define VENDOR_ENCAPSULATED_OPTION_SPACE "vendor-encapsulated-options-space"
-#define LQ_QUERY_OPTION_SPACE            "lq-query-option-space"
 
 // NOTE:
 // When adding a new space, make sure you also update
@@ -565,18 +564,6 @@ const int V4V6_BIND_OPTION_DEFINITIONS_SIZE =
     sizeof(V4V6_BIND_OPTION_DEFINITIONS) /
     sizeof(V4V6_BIND_OPTION_DEFINITIONS[0]);
 
-/// @brief LQ_QUERY suboption definitions (v6)
-const OptionDefParams LQ_QUERY_OPTION_DEFINITIONS[] = {
-    { "clientid", D6O_CLIENTID, OPT_BINARY_TYPE, false, NO_RECORD_DEF, ""},
-    { "iaaddr", D6O_IAADDR, OPT_RECORD_TYPE, false, RECORD_DEF(IAADDR_RECORDS), ""},
-    { "oro", D6O_ORO, OPT_UINT16_TYPE, true, NO_RECORD_DEF, "" }
-};
-
-const int LQ_QUERY_OPTION_DEFINITIONS_SIZE =
-    sizeof(LQ_QUERY_OPTION_DEFINITIONS) /
-    sizeof(LQ_QUERY_OPTION_DEFINITIONS[0]);
-
-
 }  // namespace
 
 }  // namespace dhcp