From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 23 Sep 2020 11:13:01 +0000 (+0200)
Subject: smbd: improve smbXsrv_connection_dbg() for debugging multi-channel problems
X-Git-Tag: tevent-0.11.0~1674
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9ff08649f3c9f8bb5896a0c0a70fbcdf856c9d5;p=thirdparty%2Fsamba.git

smbd: improve smbXsrv_connection_dbg() for debugging multi-channel problems

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14534

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 9e861554fa7..0b02f85c41f 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3745,16 +3745,23 @@ static void smbd_tevent_trace_callback(enum tevent_trace_point point,
 const char *smbXsrv_connection_dbg(const struct smbXsrv_connection *xconn)
 {
 	const char *ret;
-
+	char *addr;
 	/*
 	 * TODO: this can be improved later
 	 * maybe including the client guid or more
 	 */
-	ret = tsocket_address_string(xconn->remote_address, talloc_tos());
-	if (ret == NULL) {
+	addr = tsocket_address_string(xconn->remote_address, talloc_tos());
+	if (addr == NULL) {
 		return "<tsocket_address_string() failed>";
 	}
 
+	ret = talloc_asprintf(talloc_tos(), "ptr=%p,id=%llu,addr=%s",
+			      xconn, (unsigned long long)xconn->channel_id, addr);
+	TALLOC_FREE(addr);
+	if (ret == NULL) {
+		return "<talloc_asprintf() failed>";
+	}
+
 	return ret;
 }