]> git.ipfire.org Git - thirdparty/kea.git/commit
[#413,!288] - kea-dhcp6 now uses globals from config back end
authorThomas Markwalder <tmark@isc.org>
Thu, 28 Mar 2019 15:03:07 +0000 (11:03 -0400)
committerThomas Markwalder <tmark@isc.org>
Wed, 10 Apr 2019 17:36:13 +0000 (13:36 -0400)
commitc416c968f81f54c9e69d92ff7ea4ced4d681c1d9
treee2a029051a0f5eb97324fec855a6407a61b1f880
parent9f50530f4e5e519b4a0cb1536d5ae072af817648
[#413,!288] - kea-dhcp6 now uses globals from config back end

src/bin/dhcp6/tests/config_backend_unittest.cc
    TEST_F(Dhcp6CBTest, mergeGlobals) - enabled test

src/lib/dhcpsrv/srv_config.*
    SrvConfig::merge(ConfigBase& other) - invoke merge6()
    SrvConfig::mergeGlobals4() renamed to mergeGlobals()

    SrvConfig::merge6(SrvConfig& other) - new method

src/lib/dhcpsrv/tests/srv_config_unittest.cc
    TEST_F(SrvConfigTest, mergeGlobals6)  - new test
src/bin/dhcp6/tests/config_backend_unittest.cc
src/lib/dhcpsrv/srv_config.cc
src/lib/dhcpsrv/srv_config.h
src/lib/dhcpsrv/tests/srv_config_unittest.cc