s3:smbd multichannel: improve smbXsrv_connection_dbg()

client_guid as well as local and remote address help a lot
for debugging...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/smbd/smb2_process.c b/source3/smbd/smb2_process.c
index 9aefea8a41e5351b610fc1eb13c4ce5d567f8bca..7366427335934d2c222bda5d5c026e3472101ccd 100644 (file)
--- a/source3/smbd/smb2_process.c
+++ b/source3/smbd/smb2_process.c
@@ -688,20 +688,33 @@ NTSTATUS smbXsrv_connection_init_tables(struct smbXsrv_connection *conn,
  */
 const char *smbXsrv_connection_dbg(const struct smbXsrv_connection *xconn)
 {
-       const char *ret;
-       char *addr;
+       const char *ret = NULL;
+       char *raddr = NULL;
+       char *laddr = NULL;
+       struct GUID_txt_buf guid_buf = {};
+
        /*
-        * TODO: this can be improved later
-        * maybe including the client guid or more
+        * TODO: this can be improved further later...
         */
-       addr = tsocket_address_string(xconn->remote_address, talloc_tos());
-       if (addr == NULL) {
+
+       raddr = tsocket_address_string(xconn->remote_address, talloc_tos());
+       if (raddr == NULL) {
+               return "<tsocket_address_string() failed>";
+       }
+       laddr = tsocket_address_string(xconn->local_address, talloc_tos());
+       if (laddr == 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);
+       ret = talloc_asprintf(talloc_tos(),
+                       "PID=%d,CLIENT=%s,channel=%"PRIu64",remote=%s,local=%s",
+                       getpid(),
+                       GUID_buf_string(&xconn->smb2.client.guid, &guid_buf),
+                       xconn->channel_id,
+                       raddr,
+                       laddr);
+       TALLOC_FREE(raddr);
+       TALLOC_FREE(laddr);
        if (ret == NULL) {
                return "<talloc_asprintf() failed>";
        }