From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 3 Aug 2017 19:19:00 +0000 (-0400)
Subject: [5314]  Suppress excluded_prefix when blank in Pool6::toElement()
X-Git-Tag: trac5124a_base~9^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44c02f59720e359c0b3eed27c1aa7ec2a36696ca;p=thirdparty%2Fkea.git

[5314]  Suppress excluded_prefix when blank in Pool6::toElement()

    Pool6::toElement() will only include excluded-prefix if it isn't
    blank.
---

diff --git a/src/lib/dhcpsrv/subnet.cc b/src/lib/dhcpsrv/subnet.cc
index a5d1b08ae4..a28c0a9cbf 100644
--- a/src/lib/dhcpsrv/subnet.cc
+++ b/src/lib/dhcpsrv/subnet.cc
@@ -657,6 +657,7 @@ Subnet6::toElement() const {
         uint8_t len = pdpool->getLength();
         pool_map->set("delegated-len",
                       Element::create(static_cast<int>(len)));
+
         // Set excluded prefix
         const Option6PDExcludePtr& xopt =
             pdpool->getPrefixExcludeOption();
@@ -668,11 +669,8 @@ Subnet6::toElement() const {
             uint8_t xlen = xopt->getExcludedPrefixLength();
             pool_map->set("excluded-prefix-len",
                           Element::create(static_cast<int>(xlen)));
-        } else {
-            pool_map->set("excluded-prefix",
-                          Element::create(std::string("::")));
-            pool_map->set("excluded-prefix-len", Element::create(0));
         }
+
         // Set user-context
         ConstElementPtr context = pdpool->getContext();
         if (!isNull(context)) {
diff --git a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
index 5b75ebd245..7572201fe8 100644
--- a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
@@ -545,8 +545,6 @@ TEST(CfgSubnets6Test, unparsePdPool) {
         "            \"prefix\": \"2001:db8:2::\",\n"
         "            \"prefix-len\": 48,\n"
         "            \"delegated-len\": 64,\n"
-        "            \"excluded-prefix\": \"::\",\n"
-        "            \"excluded-prefix-len\": 0,\n"
         "            \"option-data\": [ ]\n"
         "        },{\n"
         "            \"prefix\": \"2001:db8:3::\",\n"