mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[4106_rebase] Addressed comments

Browse Source
This commit is contained in:
Francis Dupont
2016-06-06 17:38:54 +02:00
parent 5830ab6983
commit 8c17b2766a
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/dhcpsrv/dhcp4o6_ipc.cc
View File

@@ -20,6 +20,7 @@
#include <dhcp/option_string.h> #include <dhcp/option_string.h>
#include <dhcp/option_vendor.h> #include <dhcp/option_vendor.h>
#include <dhcpsrv/dhcp4o6_ipc.h> #include <dhcpsrv/dhcp4o6_ipc.h>
#include <dhcpsrv/dhcpsrv_log.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
@@ -147,25 +148,46 @@ Pkt6Ptr Dhcp4o6IpcBase::receive() {
pkt->unpack(); pkt->unpack();
OptionVendorPtr vendor = OptionVendorPtr vendor =
boost::dynamic_pointer_cast<OptionVendor>(pkt->getOption(D6O_VENDOR_OPTS)); boost::dynamic_pointer_cast<OptionVendor>(pkt->getOption(D6O_VENDOR_OPTS));
if (!vendor || vendor->getVendorId() != ENTERPRISE_ID_ISC) { if (!vendor) {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL,
DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET)
.arg("no vendor option");
return (Pkt6Ptr());
}
if (vendor->getVendorId() != ENTERPRISE_ID_ISC) {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL,
DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET)
.arg("vendor option enterprise ID is not ISC");
return (Pkt6Ptr()); return (Pkt6Ptr());
} }
OptionStringPtr ifname = OptionStringPtr ifname =
boost::dynamic_pointer_cast<OptionString>(vendor->getOption(ISC_V6_4O6_INTERFACE)); boost::dynamic_pointer_cast<OptionString>(vendor->getOption(ISC_V6_4O6_INTERFACE));
if (!ifname) { if (!ifname) {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL,
DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET)
.arg("no interface suboption");
return (Pkt6Ptr()); return (Pkt6Ptr());
} }
IfacePtr iface = IfaceMgr::instance().getIface(ifname->getValue()); IfacePtr iface = IfaceMgr::instance().getIface(ifname->getValue());
if (!iface) { if (!iface) {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL,
DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET)
.arg("can't get interface");
return (Pkt6Ptr()); return (Pkt6Ptr());
} }
Option6AddrLstPtr srcs = Option6AddrLstPtr srcs =
boost::dynamic_pointer_cast<Option6AddrLst>(vendor->getOption(ISC_V6_4O6_SRC_ADDRESS)); boost::dynamic_pointer_cast<Option6AddrLst>(vendor->getOption(ISC_V6_4O6_SRC_ADDRESS));
if (!srcs) { if (!srcs) {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL,
DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET)
.arg("no source address suboption");
return (Pkt6Ptr()); return (Pkt6Ptr());
} }
Option6AddrLst::AddressContainer addrs = srcs->getAddresses(); Option6AddrLst::AddressContainer addrs = srcs->getAddresses();
if (addrs.size() != 1) { if (addrs.size() != 1) {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL,
DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET)
.arg("bad source address suboption");
return (Pkt6Ptr()); return (Pkt6Ptr());
} }
@@ -196,7 +218,6 @@ void Dhcp4o6IpcBase::send(Pkt6Ptr pkt) {
// enterprise id, let's create it. // enterprise id, let's create it.
if (!vendor_opt || (vendor_opt->getVendorId() != ENTERPRISE_ID_ISC)) { if (!vendor_opt || (vendor_opt->getVendorId() != ENTERPRISE_ID_ISC)) {
vendor_opt.reset(new OptionVendor(Option::V6, ENTERPRISE_ID_ISC)); vendor_opt.reset(new OptionVendor(Option::V6, ENTERPRISE_ID_ISC));
pkt->addOption(vendor_opt);
} }

3
src/lib/dhcpsrv/dhcpsrv_messages.mes
View File

@@ -151,6 +151,9 @@ the database access parameters are changed: in the latter case, the
server closes the currently open database, and opens a database using server closes the currently open database, and opens a database using
the new parameters. the new parameters.
% DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET received bad DHCPv4o6 packet: %1
A bad DHCPv4o6 packet was received.
% DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION error handler for DHCP_DDNS IO generated an expected exception: %1 % DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION error handler for DHCP_DDNS IO generated an expected exception: %1
This is an error message that occurs when an attempt to send a request to This is an error message that occurs when an attempt to send a request to
kea-dhcp-ddns fails there registered error handler threw an uncaught exception. kea-dhcp-ddns fails there registered error handler threw an uncaught exception.