mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[master] Merge branch 'trac4106'

Browse Source
This commit is contained in:
Marcin Siodelski
2015-12-10 12:24:15 +01:00
parent ed7edadcbd 96a612f446
commit 8f2a1f8a7a
27 changed files with 1897 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/dhcp4/json_config_parser.cc
View File

@@ -422,9 +422,10 @@ DhcpConfigParser* createGlobalDhcp4ConfigParser(const std::string& config_id,
if ((config_id.compare("valid-lifetime") == 0) ||
(config_id.compare("renew-timer") == 0) ||
(config_id.compare("rebind-timer") == 0) ||
(config_id.compare("decline-probation-period") == 0) ) {
(config_id.compare("decline-probation-period") == 0) ||
(config_id.compare("dhcp4o6-port") == 0) ) {
parser = new Uint32Parser(config_id,
globalContext()->uint32_values_);
globalContext()->uint32_values_);
} else if (config_id.compare("interfaces-config") == 0) {
parser = new IfacesConfigParser4();
} else if (config_id.compare("subnet4") == 0) {
@@ -472,6 +473,7 @@ DhcpConfigParser* createGlobalDhcp4ConfigParser(const std::string& config_id,
///
/// - echo-client-id
/// - decline-probation-period
/// - dhcp4o6-port
void setGlobalParameters4() {
// Although the function is modest for now, it is certain that the number
// of global switches will increase over time, hence the name.
@@ -494,6 +496,15 @@ void setGlobalParameters4() {
} catch (...) {
// That's not really needed.
}
// Set the DHCPv4-over-DHCPv6 interserver port.
try {
uint32_t dhcp4o6_port = globalContext()->uint32_values_
->getOptionalParam("dhcp4o6-port", 0);
CfgMgr::instance().getStagingCfg()->setDhcp4o6Port(dhcp4o6_port);
} catch (...) {
// Ignore errors. This flag is optional
}
}
isc::data::ConstElementPtr