[master] Merge branch 'trac4106'

diff --cc src/bin/dhcp4/Makefile.am
Simple merge

diff --cc src/bin/dhcp4/json_config_parser.cc
Simple merge

diff --cc src/bin/dhcp4/tests/Makefile.am
Simple merge

diff --cc src/bin/dhcp6/Makefile.am
Simple merge

diff --cc src/bin/dhcp6/ctrl_dhcp6_srv.cc
index f3453c2dc70282856788e3ede90d103fec899bc3,c318919b3dc14a83aa5a90e4b42f0c06575c9ce0..ca74c32ae8d9b6982a01b9900b3d140111937b34
--- 1/src/bin/dhcp6/ctrl_dhcp6_srv.cc
--- 2/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@@ -15,9 -15,9 +15,10 @@@
  #include <config.h>
  #include <cc/data.h>
  #include <config/command_mgr.h>
 +#include <dhcp/libdhcp++.h>
  #include <dhcpsrv/cfgmgr.h>
  #include <dhcp6/ctrl_dhcp6_srv.h>
+ #include <dhcp6/dhcp6_dhcp4o6_ipc.h>
  #include <dhcp6/dhcp6_log.h>
  #include <dhcp6/json_config_parser.h>
  #include <hooks/hooks_manager.h>

diff --cc src/bin/dhcp6/dhcp6_srv.cc
Simple merge

diff --cc src/bin/dhcp6/json_config_parser.cc
Simple merge

diff --cc src/bin/dhcp6/tests/Makefile.am
Simple merge

diff --cc src/lib/dhcpsrv/Makefile.am
index e2be804e176ec1d15ada072d742bf0e765da83c5,bbf1ab403bb7df58501714010f0e55278ed05dd3..b324a51c11268609fcb1f26b257d867233272528
mode 100755,100644..100755
--- 1/src/lib/dhcpsrv/Makefile.am
--- 2/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@@ -103,7 -94,7 +103,8 @@@ libkea_dhcpsrv_la_SOURCES += d2_client_
  libkea_dhcpsrv_la_SOURCES += d2_client_mgr.cc d2_client_mgr.h
  libkea_dhcpsrv_la_SOURCES += daemon.cc daemon.h
  libkea_dhcpsrv_la_SOURCES += database_connection.cc database_connection.h
 +libkea_dhcpsrv_la_SOURCES += db_exceptions.h
+ libkea_dhcpsrv_la_SOURCES += dhcp4o6_ipc.cc dhcp4o6_ipc.h
  libkea_dhcpsrv_la_SOURCES += dhcpsrv_log.cc dhcpsrv_log.h
  libkea_dhcpsrv_la_SOURCES += host.cc host.h
  libkea_dhcpsrv_la_SOURCES += host_container.h

diff --cc src/lib/dhcpsrv/srv_config.cc
index 67b9d31086c5cd86484427cf5b6218842e7265b0,027bce9c5ffea0332692d0a2d26fa483f29df697..385f266dc28ae490769bc66b68c630b9061f2567
--- 1/src/lib/dhcpsrv/srv_config.cc
--- 2/src/lib/dhcpsrv/srv_config.cc
+++ b/src/lib/dhcpsrv/srv_config.cc
@@@ -31,9 -31,8 +31,9 @@@ SrvConfig::SrvConfig(
        cfg_option_def_(new CfgOptionDef()), cfg_option_(new CfgOption()),
        cfg_subnets4_(new CfgSubnets4()), cfg_subnets6_(new CfgSubnets6()),
        cfg_hosts_(new CfgHosts()), cfg_rsoo_(new CfgRSOO()),
 -      cfg_expiration_(new CfgExpiration()),
 +      cfg_expiration_(new CfgExpiration()), cfg_duid_(new CfgDUID()),
 +      class_dictionary_(new ClientClassDictionary()),
-       decline_timer_(0) {
+       decline_timer_(0), dhcp4o6_port_(0) {
  }
  
  SrvConfig::SrvConfig(const uint32_t sequence)
@@@ -41,9 -40,8 +41,9 @@@
        cfg_option_def_(new CfgOptionDef()), cfg_option_(new CfgOption()),
        cfg_subnets4_(new CfgSubnets4()), cfg_subnets6_(new CfgSubnets6()),
        cfg_hosts_(new CfgHosts()), cfg_rsoo_(new CfgRSOO()),
 -      cfg_expiration_(new CfgExpiration()),
 +      cfg_expiration_(new CfgExpiration()), cfg_duid_(new CfgDUID()),
 +      class_dictionary_(new ClientClassDictionary()),
-       decline_timer_(0) {
+       decline_timer_(0), dhcp4o6_port_(0) {
  }
  
  std::string

diff --cc src/lib/dhcpsrv/srv_config.h
Simple merge

diff --cc src/lib/dhcpsrv/tests/Makefile.am
index d01bcb3108fab7ab9d3610998c7078534ce92127,7957e1009cb5477b480013177437e44744b74491..f7f2ebfd7e17d9051cad7d00413266433bb6317d
mode 100755,100644..100755
--- 1/src/lib/dhcpsrv/tests/Makefile.am
--- 2/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@@ -85,7 -82,7 +85,8 @@@ libdhcpsrv_unittests_SOURCES += d2_udp_
  libdhcpsrv_unittests_SOURCES += daemon_unittest.cc
  libdhcpsrv_unittests_SOURCES += database_connection_unittest.cc
  libdhcpsrv_unittests_SOURCES += dbaccess_parser_unittest.cc
+ libdhcpsrv_unittests_SOURCES += dhcp4o6_ipc_unittest.cc
 +libdhcpsrv_unittests_SOURCES += duid_config_parser_unittest.cc
  libdhcpsrv_unittests_SOURCES += expiration_config_parser_unittest.cc
  libdhcpsrv_unittests_SOURCES += host_mgr_unittest.cc
  libdhcpsrv_unittests_SOURCES += host_unittest.cc