sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

smbd: Move smbXsrv_connection_dbg to smb2_process.c

Browse Source 
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
David Mulder 2022-03-18 15:13:25 -06:00 committed by Jeremy Allison
parent 635bf8513b
commit 7a8f77acb9
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/smbd/process.c
View File

@ -3404,36 +3404,6 @@ static void smbd_tevent_trace_callback(enum tevent_trace_point point,
errno = 0;
}
/**
* Create a debug string for the connection
*
* This is allocated to talloc_tos() or a string constant
* in certain corner cases. The returned string should
* hence not be free'd directly but only via the talloc stack.
*/
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
*/
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;
}
static int smbXsrv_connection_destructor(struct smbXsrv_connection *xconn)
{
DBG_DEBUG("xconn[%s]\n", smbXsrv_connection_dbg(xconn));

30
source3/smbd/smb2_process.c
View File

@ -701,3 +701,33 @@ NTSTATUS smbXsrv_connection_init_tables(struct smbXsrv_connection *conn,
set_Protocol(protocol);
return NT_STATUS_OK;
}
/**
* Create a debug string for the connection
*
* This is allocated to talloc_tos() or a string constant
* in certain corner cases. The returned string should
* hence not be free'd directly but only via the talloc stack.
*/
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
*/
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;
}