[#4527] added debug log message on open socket

diff --git a/src/lib/dhcp/dhcp_messages.cc b/src/lib/dhcp/dhcp_messages.cc
index ca26950c5335e6ee7e03bad899b6d51b012d7b15..a4536ce38b5fae655ecfea3ec372c0500764120a 100644 (file)
--- a/src/lib/dhcp/dhcp_messages.cc
+++ b/src/lib/dhcp/dhcp_messages.cc
@@ -12,6 +12,7 @@ extern const isc::log::MessageID DHCP_ADD_EXTERNAL_SOCKET_BAD_THREAD = "DHCP_ADD
 extern const isc::log::MessageID DHCP_DELETE_ALL_EXTERNAL_SOCKETS_BAD_THREAD = "DHCP_DELETE_ALL_EXTERNAL_SOCKETS_BAD_THREAD";
 extern const isc::log::MessageID DHCP_DELETE_EXTERNAL_SOCKET_BAD_THREAD = "DHCP_DELETE_EXTERNAL_SOCKET_BAD_THREAD";
 extern const isc::log::MessageID DHCP_DELETE_EXTERNAL_SOCKET_NOT_FOUND = "DHCP_DELETE_EXTERNAL_SOCKET_NOT_FOUND";
+extern const isc::log::MessageID DHCP_IFACE_OPEN_SOCKET = "DHCP_IFACE_OPEN_SOCKET";
 extern const isc::log::MessageID DHCP_IFACE_SOCKET_ERROR = "DHCP_IFACE_SOCKET_ERROR";
 extern const isc::log::MessageID DHCP_RECEIVE4_UNKNOWN = "DHCP_RECEIVE4_UNKNOWN";
 extern const isc::log::MessageID DHCP_RECEIVE6_UNKNOWN = "DHCP_RECEIVE6_UNKNOWN";
@@ -27,6 +28,7 @@ const char* values[] = {
     "DHCP_DELETE_ALL_EXTERNAL_SOCKETS_BAD_THREAD", "Attempted to unregister external sockets from different thread %1 than main thread %2",
     "DHCP_DELETE_EXTERNAL_SOCKET_BAD_THREAD", "Attempted to unregister external socket %1 from different thread %2 than main thread %3",
     "DHCP_DELETE_EXTERNAL_SOCKET_NOT_FOUND", "Deleting a not found external socket %1",
+    "DHCP_IFACE_OPEN_SOCKET", "Opened socket on the interface %1 with address %2 and port %3",
     "DHCP_IFACE_SOCKET_ERROR", "Got an error on the interface socket %1 of interface %2: %3",
     "DHCP_RECEIVE4_UNKNOWN", "Received data over unknown socket",
     "DHCP_RECEIVE6_UNKNOWN", "Received data over unknown socket",

diff --git a/src/lib/dhcp/dhcp_messages.h b/src/lib/dhcp/dhcp_messages.h
index 8469ce50357e7ac5fc014e5b5b93e5d3e843f646..d0be1fbe0e30bc45b3b1519ee7f50d4fb9810895 100644 (file)
--- a/src/lib/dhcp/dhcp_messages.h
+++ b/src/lib/dhcp/dhcp_messages.h
@@ -13,6 +13,7 @@ extern const isc::log::MessageID DHCP_ADD_EXTERNAL_SOCKET_BAD_THREAD;
 extern const isc::log::MessageID DHCP_DELETE_ALL_EXTERNAL_SOCKETS_BAD_THREAD;
 extern const isc::log::MessageID DHCP_DELETE_EXTERNAL_SOCKET_BAD_THREAD;
 extern const isc::log::MessageID DHCP_DELETE_EXTERNAL_SOCKET_NOT_FOUND;
+extern const isc::log::MessageID DHCP_IFACE_OPEN_SOCKET;
 extern const isc::log::MessageID DHCP_IFACE_SOCKET_ERROR;
 extern const isc::log::MessageID DHCP_RECEIVE4_UNKNOWN;
 extern const isc::log::MessageID DHCP_RECEIVE6_UNKNOWN;

diff --git a/src/lib/dhcp/dhcp_messages.mes b/src/lib/dhcp/dhcp_messages.mes
index 81b0aeb51620e074f8a9cb535806174b93d75f5d..732573cb6cd72a4553cecc845d750a23b7cbed49 100644 (file)
--- a/src/lib/dhcp/dhcp_messages.mes
+++ b/src/lib/dhcp/dhcp_messages.mes
@@ -32,6 +32,10 @@ The file descriptor and the respective thread ids are included in the message.
 This warning message indicates that an external socket was deleted but
 it can't be found i.e. adds and deletes are not correctly balanced.
 
+% DHCP_IFACE_OPEN_SOCKET Opened socket on the interface %1 with address %2 and port %3
+This debug message indicates that a socket has been opened for a
+specific interface. The interface name, address and port are logged.
+
 % DHCP_IFACE_SOCKET_ERROR Got an error on the interface socket %1 of interface %2: %3
 This error message indicates that an error was raised on an interface socket.
 The file descriptor, interface name and error message are displayed.

diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index 5e882f28e828663ec7872f05d7f930538ddd7f0c..4cd2fe489daa32444e8b46a1bb182c66d1d1dfa3 100644 (file)
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -18,6 +18,7 @@
 #include <dhcp/pkt_filter_inet.h>
 #include <dhcp/pkt_filter_inet6.h>
 #include <exceptions/exceptions.h>
+#include <log/macros.h>
 #include <util/fd_event_handler_factory.h>
 #include <util/io/pktinfo_utilities.h>
 #include <util/multi_threading_mgr.h>
@@ -1037,16 +1038,22 @@ int IfaceMgr::openSocket(const std::string& ifname, const IOAddress& addr,
     if (!iface) {
         isc_throw(BadValue, "There is no " << ifname << " interface present.");
     }
+    int status = 0;
     if (addr.isV4()) {
-        return openSocket4(*iface, addr, port, receive_bcast, send_bcast);
+        status = openSocket4(*iface, addr, port, receive_bcast, send_bcast);
 
     } else if (addr.isV6()) {
-        return openSocket6(*iface, addr, port, receive_bcast);
+        status = openSocket6(*iface, addr, port, receive_bcast);
 
     } else {
         isc_throw(BadValue, "Failed to detect family of address: "
                   << addr);
     }
+    LOG_DEBUG(dhcp_logger, isc::log::DBGLVL_TRACE_BASIC, DHCP_IFACE_OPEN_SOCKET)
+        .arg(ifname)
+        .arg(addr.toText())
+        .arg(port);
+    return (status);
 }
 
 int IfaceMgr::openSocketFromIface(const std::string& ifname,