BIND 10 trac1555, updated. 4084c5f2a9a24009d645def53697b139bf989124 [1555] Throw exception if the interface instance is NULL.
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Jul 19 14:40:19 UTC 2013
The branch, trac1555 has been updated
via 4084c5f2a9a24009d645def53697b139bf989124 (commit)
from 6b65ea8a618d32efcdc0697cf0acc534b6f13404 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4084c5f2a9a24009d645def53697b139bf989124
Author: Marcin Siodelski <marcin at isc.org>
Date: Fri Jul 19 16:35:36 2013 +0200
[1555] Throw exception if the interface instance is NULL.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp4/dhcp4_srv.cc | 5 +++++
src/bin/dhcp6/dhcp6_srv.cc | 5 +++++
2 files changed, 10 insertions(+)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index a9f0a50..bf877b9 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -835,6 +835,11 @@ Dhcpv4Srv::openActiveSockets(const uint16_t port,
for (IfaceMgr::IfaceCollection::const_iterator iface = ifaces.begin();
iface != ifaces.end(); ++iface) {
Iface* iface_ptr = IfaceMgr::instance().getIface(iface->getName());
+ if (iface_ptr == NULL) {
+ isc_throw(isc::Unexpected, "Interface Manager returned NULL"
+ << " instance of the interface when DHCPv4 server was"
+ << " trying to reopen sockets after reconfiguration");
+ }
if (CfgMgr::instance().isActiveIface(iface->getName())) {
iface_ptr->inactive4_ = false;
LOG_INFO(dhcp4_logger, DHCP4_ACTIVATE_INTERFACE)
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index f6991ec..7015445 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -1116,6 +1116,11 @@ Dhcpv6Srv::openActiveSockets(const uint16_t port) {
for (IfaceMgr::IfaceCollection::const_iterator iface = ifaces.begin();
iface != ifaces.end(); ++iface) {
Iface* iface_ptr = IfaceMgr::instance().getIface(iface->getName());
+ if (iface_ptr == NULL) {
+ isc_throw(isc::Unexpected, "Interface Manager returned NULL"
+ << " instance of the interface when DHCPv6 server was"
+ << " trying to reopen sockets after reconfiguration");
+ }
if (CfgMgr::instance().isActiveIface(iface->getName())) {
iface_ptr->inactive4_ = false;
LOG_INFO(dhcp6_logger, DHCP6_ACTIVATE_INTERFACE)
More information about the bind10-changes
mailing list