Browse Source

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

    Pool6::toElement() will only include excluded-prefix if it isn't
    blank.
Thomas Markwalder 7 years ago
parent
commit
44c02f5972
2 changed files with 2 additions and 6 deletions
  1. 2 4
      src/lib/dhcpsrv/subnet.cc
  2. 0 2
      src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc

+ 2 - 4
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)) {

+ 0 - 2
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"