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] Finishing merge of trac3389a (re-detect interfaces)

Browse Source
This commit is contained in:
Francis Dupont
2017-07-05 14:52:54 +02:00
parent 875f7862cf 9176623787
commit dd19455911
41 changed files with 5122 additions and 5082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -489,9 +489,15 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set,
}
if (config_pair.first == "interfaces-config") {
ElementPtr ifaces_cfg =
boost::const_pointer_cast<Element>(config_pair.second);
if (check_only) {
// No re-detection in check only mode
ifaces_cfg->set("re-detect", Element::create(false));
}
IfacesConfigParser parser(AF_INET);
CfgIfacePtr cfg_iface = srv_cfg->getCfgIface();
parser.parse(cfg_iface, config_pair.second);
parser.parse(cfg_iface, ifaces_cfg);
continue;
}