]> git.ipfire.org Git - thirdparty/kea.git/commit
[#401,!254] kea-dhcp4 now merges CB options into current config
authorThomas Markwalder <tmark@isc.org>
Mon, 4 Mar 2019 15:54:53 +0000 (10:54 -0500)
committerThomas Markwalder <tmark@isc.org>
Fri, 8 Mar 2019 21:43:52 +0000 (16:43 -0500)
commit1a663d09e49eb40d2f5132d8af2cda810d660390
tree03a4825f29268f282f3537d0482afc0b4fc2c2e3
parent723efb56e823194200ab00dffcbed75f2864ffaf
[#401,!254] kea-dhcp4 now merges CB options into current config

Basic merging works, need to add validation against definitions.

src/bin/dhcp4/tests/config_backend_unittest.cc
    TEST_F(Dhcp4CBTest, mergeOptions) - enabled and updated

src/lib/dhcpsrv/cfg_option.*
    CfgOption::merge(CfgOption& other) - new method, conformant
    to others, that merges/updates a config option from another

src/lib/dhcpsrv/srv_config.cc
    SrvConfig::merge4(SrvConfig& other) - modified to
    merge configured options

src/lib/dhcpsrv/tests/cfg_option_unittest.cc
    TEST_F(CfgOptionTest, merge) - new test
src/bin/dhcp4/tests/config_backend_unittest.cc
src/lib/dhcpsrv/cfg_option.cc
src/lib/dhcpsrv/cfg_option.h
src/lib/dhcpsrv/srv_config.cc
src/lib/dhcpsrv/tests/cfg_option_unittest.cc