From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 14 Jan 2014 09:57:27 +0000 (+0100)
Subject: [3279] Include transaction id in the logger message.
X-Git-Tag: bind10-1.2.0beta1-release~141^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c716f4335d644744d16fa624e2b14dcf7bf217a4;p=thirdparty%2Fkea.git

[3279] Include transaction id in the logger message.
---

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 92dfd02f4f..582871de9c 100644
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -175,12 +175,12 @@ IPv4 DHCP server but it is not running.
 A debug message issued during startup, this indicates that the IPv4 DHCP
 server is about to open sockets on the specified port.
 
-% DHCP4_PACKET_NOT_FOR_US received DHCPv4 message dropped because it contains foreign server identifier, interface: %1
+% DHCP4_PACKET_NOT_FOR_US received DHCPv4 message dropped because it contains foreign server identifier: transaction id %1, interface: %2
 This debug message is issued when received DHCPv4 message is dropped because
 it is addressed to a different server, i.e. a server identifier held by
-this message doesn't match the identifier used by our server. The argument
-of this message holds the name of the interface on which the message has
-been received.
+this message doesn't match the identifier used by our server. The arguments
+of this message hold the name of the transaction id and interface on which
+the message has been received.
 
 % DHCP4_OPEN_SOCKET_FAIL failed to create socket: %1
 A warning message issued when IfaceMgr fails to open and bind a socket. The reason
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 7678354698..864e6ca232 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -259,10 +259,11 @@ Dhcpv4Srv::run() {
             }
         }
 
-        // Check if the DHCPv4 packet has been sent to us, to to someone else.
+        // Check if the DHCPv4 packet has been sent to us or to someone else.
         // If it hasn't been sent to us, drop it!
         if (!acceptServerId(query)) {
             LOG_DEBUG(dhcp4_logger, DBG_DHCP4_DETAIL, DHCP4_PACKET_NOT_FOR_US)
+                .arg(query->getTransid())
                 .arg(query->getIface());
             continue;
         }