From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 10 Dec 2015 11:24:15 +0000 (+0100)
Subject: [master] Merge branch 'trac4106'
X-Git-Tag: trac3923a_base~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f2a1f8a7a0e27a8c584186cfda089cd88ec6153;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4106'
---

8f2a1f8a7a0e27a8c584186cfda089cd88ec6153
diff --cc src/bin/dhcp6/ctrl_dhcp6_srv.cc
index f3453c2dc7,c318919b3d..ca74c32ae8
--- a/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/lib/dhcpsrv/Makefile.am
index e2be804e17,bbf1ab403b..b324a51c11
mode 100755,100644..100755
--- a/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 67b9d31086,027bce9c5f..385f266dc2
--- a/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/tests/Makefile.am
index d01bcb3108,7957e1009c..f7f2ebfd7e
mode 100755,100644..100755
--- a/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