mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-10-03 13:16:15 +00:00
Code Issues Releases Wiki Activity

[3947] Removed the new-leases-on-renew config parameter.

Browse Source 
This change removes ability to disable allocation new leases new
Renew/Rebind, specified in RFC7550. The behavior specified in this
RFC is the only supported behavior.
This commit is contained in:
Marcin Siodelski
2015-07-30 14:49:21 +02:00
parent 623693cd96
commit ddb442f78b
17 changed files with 158 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/dhcp6/json_config_parser.cc
View File

@@ -475,16 +475,13 @@ protected:
// Gather boolean parameters values.
bool rapid_commit = boolean_values_->getOptionalParam("rapid-commit", false);
bool alloc_leases_on_renew = globalContext()->
boolean_values_->getOptionalParam("new-leases-on-renew", true);
std::ostringstream output;
output << addr << "/" << static_cast<int>(len)
<< " with params t1=" << t1 << ", t2="
<< t2 << ", preferred-lifetime=" << pref
<< ", valid-lifetime=" << valid
<< ", rapid-commit is " << (rapid_commit ? "enabled" : "disabled")
<< ", new-leases-on-renew is " << (alloc_leases_on_renew ? "enabled" : "disabled");
<< ", rapid-commit is " << (rapid_commit ? "enabled" : "disabled");
LOG_INFO(dhcp6_logger, DHCP6_CONFIG_NEW_SUBNET).arg(output.str());
@@ -502,8 +499,6 @@ protected:
// Enable or disable Rapid Commit option support for the subnet.
subnet6->setRapidCommit(rapid_commit);
// Enable or disable allocation of the new leases for the Renew or/and Rebind message.
subnet6->setAllocLeasesOnRenew(alloc_leases_on_renew);
// Try setting up client class (if specified)
try {
@@ -700,8 +695,6 @@ namespace dhcp {
parser = new RSOOListConfigParser(config_id);
} else if (config_id.compare("control-socket") == 0) {
parser = new ControlSocketParser(config_id);
} else if (config_id.compare("new-leases-on-renew") == 0) {
parser = new BooleanParser(config_id, globalContext()->boolean_values_);
} else {
isc_throw(DhcpConfigError,
"unsupported global configuration parameter: "