diff options
| author | Marcin Siodelski <marcin@isc.org> | 2015-12-10 22:54:57 +0100 |
|---|---|---|
| committer | Marcin Siodelski <marcin@isc.org> | 2015-12-10 23:08:59 +0100 |
| commit | 6bc8c1cb7dec473965967f00765a4242b40b9666 (patch) | |
| tree | d7567e917d841e70882353597bdb0581a95f5304 /src/bin/dhcp6/ctrl_dhcp6_srv.cc | |
| parent | [master] Fix compilation issue on RHEL6. (diff) | |
| download | kea-6bc8c1cb7dec473965967f00765a4242b40b9666.tar.xz kea-6bc8c1cb7dec473965967f00765a4242b40b9666.zip | |
Revert "[master] Merge branch 'trac4106'"
This reverts commit 8f2a1f8a7a0e27a8c584186cfda089cd88ec6153, reversing
changes made to ed7edadcbd2bde368fdde86e1c997ea225b456f5.
This merge introduced regressions in our build farm and revealed
issues in the DHCP4o6 IPC code. It also revealed some differences
in sockets handling under Linux and BSD. Rather than continue
patching this here, we should work on the branch to resolve all
issues and then merge 1.1.
Diffstat (limited to 'src/bin/dhcp6/ctrl_dhcp6_srv.cc')
| -rw-r--r-- | src/bin/dhcp6/ctrl_dhcp6_srv.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc index ca74c32ae8..f3453c2dc7 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc @@ -18,7 +18,6 @@ #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> @@ -210,16 +209,6 @@ ControlledDhcpv6Srv::processConfig(isc::data::ConstElementPtr config) { return (isc::config::createAnswer(1, err.str())); } - // Setup DHCPv4-over-DHCPv6 IPC - try { - Dhcp6to4Ipc::instance().open(); - } catch (const std::exception& ex) { - std::ostringstream err; - err << "error starting DHCPv4-over-DHCPv6 IPC " - " after server reconfiguration: " << ex.what(); - return (isc::config::createAnswer(1, err.str())); - } - // Configuration may change active interfaces. Therefore, we have to reopen // sockets according to new configuration. It is possible that this // operation will fail for some interfaces but the openSockets function |