From: Martin Schwenke <martin@meltin.net>
Date: Mon, 15 Aug 2022 04:30:09 +0000 (+1000)
Subject: ctdb-common: Improve/add debug
X-Git-Tag: samba-4.17.11~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d37c3d141565b46c40456ebf16a78a57bae4344a;p=thirdparty%2Fsamba.git

ctdb-common: Improve/add debug

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 33a80c1d63fd2e6163ef6c704b2e714e71b01384)
---

diff --git a/ctdb/common/system_socket.c b/ctdb/common/system_socket.c
index 74fe1593a01..e8ccd301f6c 100644
--- a/ctdb/common/system_socket.c
+++ b/ctdb/common/system_socket.c
@@ -880,7 +880,7 @@ int ctdb_sys_open_capture_socket(const char *iface, void **private_data)
 		return -1;
 	}
 
-	DBG_DEBUG("Created RAW SOCKET FD:%d for tcp tickle\n", s);
+	DBG_DEBUG("Opened raw socket for TCP tickle capture (fd=%d)\n", s);
 
 	ret = set_blocking(s, false);
 	if (ret != 0) {
@@ -971,6 +971,7 @@ int ctdb_sys_open_capture_socket(const char *iface, void **private_data)
 {
 	char errbuf[PCAP_ERRBUF_SIZE];
 	pcap_t *pt;
+	int fd;
 
 	pt = pcap_open_live(iface, 100, 0, 0, errbuf);
 	if (pt == NULL) {
@@ -980,8 +981,11 @@ int ctdb_sys_open_capture_socket(const char *iface, void **private_data)
 		return -1;
 	}
 	*((pcap_t **)private_data) = pt;
+	fd = pcap_get_selectable_fd(pt);
 
-	return pcap_get_selectable_fd(pt);
+	DBG_DEBUG("Opened pcap capture for TCP tickle capture (fd=%d)\n", fd);
+
+	return fd;
 }
 
 int ctdb_sys_close_capture_socket(void *private_data)