mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 06:25:34 +00:00
Code Issues Releases Wiki Activity

[#2865] Add DUID in some pkt6 prints

Browse Source
This commit is contained in:
Piotrek Zadroga
2023-06-06 11:27:09 +02:00
parent b6e6eaa0e3
commit af5e29e1f1
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/dhcp6/dhcp6_messages.cc
View File

@@ -269,9 +269,9 @@ const char* values[] = {
"DHCP6_OPEN_SOCKETS_NO_RECONNECT_CTL", "unexpected error in bind service sockets.", "DHCP6_OPEN_SOCKETS_NO_RECONNECT_CTL", "unexpected error in bind service sockets.",
"DHCP6_OPEN_SOCKET_FAIL", "failed to open socket: %1", "DHCP6_OPEN_SOCKET_FAIL", "failed to open socket: %1",
"DHCP6_PACKET_DROP_DHCP_DISABLED", "%1: DHCP service is globally disabled", "DHCP6_PACKET_DROP_DHCP_DISABLED", "%1: DHCP service is globally disabled",
"DHCP6_PACKET_DROP_DROP_CLASS", "dropped as member of the special class 'DROP': %1", "DHCP6_PACKET_DROP_DROP_CLASS", "dropped as member of the special class 'DROP': %1 %2",
"DHCP6_PACKET_DROP_DROP_CLASS2", "dropped as member of the special class 'DROP' after host reservation lookup: %1", "DHCP6_PACKET_DROP_DROP_CLASS2", "dropped as member of the special class 'DROP' after host reservation lookup: %1 %2",
"DHCP6_PACKET_DROP_DROP_CLASS_EARLY", "dropped as member of the special class 'DROP' after early global host reservations lookup: %1", "DHCP6_PACKET_DROP_DROP_CLASS_EARLY", "dropped as member of the special class 'DROP' after early global host reservations lookup: %1 %2",
"DHCP6_PACKET_DROP_DUPLICATE", "dropped as sent by the same client than a packet being processed by another thread: dropped %1 by thread %2 as duplicate of %3 processed by %4", "DHCP6_PACKET_DROP_DUPLICATE", "dropped as sent by the same client than a packet being processed by another thread: dropped %1 by thread %2 as duplicate of %3 processed by %4",
"DHCP6_PACKET_DROP_PARSE_FAIL", "failed to parse packet from %1 to %2, received over interface %3, reason: %4", "DHCP6_PACKET_DROP_PARSE_FAIL", "failed to parse packet from %1 to %2, received over interface %3, reason: %4",
"DHCP6_PACKET_DROP_SERVERID_MISMATCH", "%1: dropping packet with server identifier: %2, server is using: %3", "DHCP6_PACKET_DROP_SERVERID_MISMATCH", "%1: dropping packet with server identifier: %2, server is using: %3",

6
src/bin/dhcp6/dhcp6_messages.mes
View File

@@ -579,16 +579,16 @@ has been temporarily disabled. This affects all received DHCP packets. The
service may be enabled by the "dhcp-enable" control command or automatically service may be enabled by the "dhcp-enable" control command or automatically
after a specified amount of time since receiving "dhcp-disable" command. after a specified amount of time since receiving "dhcp-disable" command.
% DHCP6_PACKET_DROP_DROP_CLASS dropped as member of the special class 'DROP': %1 % DHCP6_PACKET_DROP_DROP_CLASS dropped as member of the special class 'DROP': %1 %2
This debug message is emitted when an incoming packet was classified This debug message is emitted when an incoming packet was classified
into the special class 'DROP' and dropped. The packet details are displayed. into the special class 'DROP' and dropped. The packet details are displayed.
% DHCP6_PACKET_DROP_DROP_CLASS2 dropped as member of the special class 'DROP' after host reservation lookup: %1 % DHCP6_PACKET_DROP_DROP_CLASS2 dropped as member of the special class 'DROP' after host reservation lookup: %1 %2
This debug message is emitted when an incoming packet was classified This debug message is emitted when an incoming packet was classified
after host reservation lookup into the special class 'DROP' and dropped. after host reservation lookup into the special class 'DROP' and dropped.
The packet details are displayed. The packet details are displayed.
% DHCP6_PACKET_DROP_DROP_CLASS_EARLY dropped as member of the special class 'DROP' after early global host reservations lookup: %1 % DHCP6_PACKET_DROP_DROP_CLASS_EARLY dropped as member of the special class 'DROP' after early global host reservations lookup: %1 %2
This debug message is emitted when an incoming packet was classified This debug message is emitted when an incoming packet was classified
after early global host reservations lookup into the special class 'DROP' after early global host reservations lookup into the special class 'DROP'
and dropped. The packet details are displayed. and dropped. The packet details are displayed.

3
src/bin/dhcp6/dhcp6_srv.cc
View File

@@ -478,6 +478,7 @@ Dhcpv6Srv::earlyGHRLookup(const Pkt6Ptr& query,
if (query->inClass("DROP")) { if (query->inClass("DROP")) {
LOG_DEBUG(packet6_logger, DBGLVL_PKT_HANDLING, LOG_DEBUG(packet6_logger, DBGLVL_PKT_HANDLING,
DHCP6_PACKET_DROP_DROP_CLASS_EARLY) DHCP6_PACKET_DROP_DROP_CLASS_EARLY)
.arg(query->makeLabel(query->getClientId(), nullptr))
.arg(query->toText()); .arg(query->toText());
StatsMgr::instance().addValue("pkt6-receive-drop", StatsMgr::instance().addValue("pkt6-receive-drop",
static_cast<int64_t>(1)); static_cast<int64_t>(1));
@@ -581,6 +582,7 @@ Dhcpv6Srv::initContext(const Pkt6Ptr& pkt,
// Check the DROP special class. // Check the DROP special class.
if (pkt->inClass("DROP")) { if (pkt->inClass("DROP")) {
LOG_DEBUG(packet6_logger, DBGLVL_PKT_HANDLING, DHCP6_PACKET_DROP_DROP_CLASS2) LOG_DEBUG(packet6_logger, DBGLVL_PKT_HANDLING, DHCP6_PACKET_DROP_DROP_CLASS2)
.arg(pkt->makeLabel(pkt->getClientId(), nullptr))
.arg(pkt->toText()); .arg(pkt->toText());
StatsMgr::instance().addValue("pkt6-receive-drop", StatsMgr::instance().addValue("pkt6-receive-drop",
static_cast<int64_t>(1)); static_cast<int64_t>(1));
@@ -896,6 +898,7 @@ Dhcpv6Srv::processPacket(Pkt6Ptr& query, Pkt6Ptr& rsp) {
// Check the DROP special class. // Check the DROP special class.
if (query->inClass("DROP")) { if (query->inClass("DROP")) {
LOG_DEBUG(packet6_logger, DBGLVL_PKT_HANDLING, DHCP6_PACKET_DROP_DROP_CLASS) LOG_DEBUG(packet6_logger, DBGLVL_PKT_HANDLING, DHCP6_PACKET_DROP_DROP_CLASS)
.arg(query->makeLabel(query->getClientId(), nullptr))
.arg(query->toText()); .arg(query->toText());
StatsMgr::instance().addValue("pkt6-receive-drop", StatsMgr::instance().addValue("pkt6-receive-drop",
static_cast<int64_t>(1)); static_cast<int64_t>(1));