Parcourir la source

[3279] Include transaction id in the logger message.

Marcin Siodelski il y a 11 ans
Parent
commit
c716f4335d
2 fichiers modifiés avec 6 ajouts et 5 suppressions
  1. 4 4
      src/bin/dhcp4/dhcp4_messages.mes
  2. 2 1
      src/bin/dhcp4/dhcp4_srv.cc

+ 4 - 4
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
 A debug message issued during startup, this indicates that the IPv4 DHCP
 server is about to open sockets on the specified port.
 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
 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
 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
 % DHCP4_OPEN_SOCKET_FAIL failed to create socket: %1
 A warning message issued when IfaceMgr fails to open and bind a socket. The reason
 A warning message issued when IfaceMgr fails to open and bind a socket. The reason

+ 2 - 1
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 it hasn't been sent to us, drop it!
         if (!acceptServerId(query)) {
         if (!acceptServerId(query)) {
             LOG_DEBUG(dhcp4_logger, DBG_DHCP4_DETAIL, DHCP4_PACKET_NOT_FOR_US)
             LOG_DEBUG(dhcp4_logger, DBG_DHCP4_DETAIL, DHCP4_PACKET_NOT_FOR_US)
+                .arg(query->getTransid())
                 .arg(query->getIface());
                 .arg(query->getIface());
             continue;
             continue;
         }
         }