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

[#981] Reworked DdnsParams to allow on-demand value fetching

Browse Source 
src/lib/dhcpsrv/d2_client_cfg.*
    Moved DdnsParams to srv_config.*

src/lib/dhcpsrv/network.h
    respaced

src/lib/dhcpsrv/srv_config.*
    DdnsParams relocated here from d2_client_cfg.*.
    Added SubnetPtr member.
    Added constructors from Subnet4Ptr and Subnet6Ptr
    Replaced individual members with getters.

src/lib/dhcpsrv/tests/d2_client_unittest.cc
src/lib/dhcpsrv/tests/srv_config_unittest.cc
    Retrofitted tests accordingly.

src/lib/dhcpsrv/alloc_engine.*
src/lib/dhcpsrv/d2_client_mgr.*
    Updated DdnsParams references

src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp4/tests/fqdn_unittest.cc
    Updated DdnsParams references

src/bin/dhcp6/dhcp6_srv.cc
src/bin/dhcp6/tests/fqdn_unittest.cc
    Updated DdnsParams references
This commit is contained in:
Thomas Markwalder
2019-12-04 08:27:07 -05:00
parent dc5fccbbe2
commit a65be143ec
15 changed files with 423 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/dhcp4/dhcp4_srv.cc
View File

@@ -1842,7 +1842,7 @@ Dhcpv4Srv::processHostnameOption(Dhcpv4Exchange& ex) {
// but there is no reservation, or the configuration of the server requires
// that we send the option regardless.
D2ClientConfig::ReplaceClientNameMode replace_name_mode =
ex.getContext()->getDdnsParams()->replace_client_name_mode_;
ex.getContext()->getDdnsParams()->getReplaceClientNameMode();
// If we don't have a hostname then either we'll supply it or do nothing.
if (!opt_hostname) {
@@ -2312,7 +2312,7 @@ Dhcpv4Srv::assignLease(Dhcpv4Exchange& ex) {
// Create NameChangeRequests if DDNS is enabled and this is a
// real allocation.
if (!fake_allocation && (ex.getContext()->getDdnsParams()->enable_updates_)) {
if (!fake_allocation && (ex.getContext()->getDdnsParams()->getEnableUpdates())) {
try {
LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL, DHCP4_NCR_CREATE)
.arg(query->getLabel());