sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

smbXsrv: rename smb2srv_session_lookup -> smb2srv_session_lookup_conn

Browse Source 
This is in preparation of adding a variant that operates
on the client and does in particular not verify that the
connection belongs to a session as a channel.

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Michael Adam
2015-07-29 10:23:14 +02:00
parent c765d11347
commit d6acf950e4
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source3/smbd/globals.h
View File

@ -553,9 +553,9 @@ NTSTATUS smb1srv_session_lookup(struct smbXsrv_connection *conn,
uint16_t vuid, NTTIME now, uint16_t vuid, NTTIME now,
struct smbXsrv_session **session); struct smbXsrv_session **session);
NTSTATUS smb2srv_session_table_init(struct smbXsrv_connection *conn); NTSTATUS smb2srv_session_table_init(struct smbXsrv_connection *conn);
NTSTATUS smb2srv_session_lookup(struct smbXsrv_connection *conn, NTSTATUS smb2srv_session_lookup_conn(struct smbXsrv_connection *conn,
uint64_t session_id, NTTIME now, uint64_t session_id, NTTIME now,
struct smbXsrv_session **session); struct smbXsrv_session **session);
struct smbXsrv_session_global0; struct smbXsrv_session_global0;
NTSTATUS smbXsrv_session_global_traverse( NTSTATUS smbXsrv_session_global_traverse(
int (*fn)(struct smbXsrv_session_global0 *, void *), int (*fn)(struct smbXsrv_session_global0 *, void *),

8
source3/smbd/smb2_break.c
View File

@ -450,10 +450,10 @@ void send_break_message_smb2(files_struct *fsp,
*/ */
xconn = fsp->conn->sconn->client->connections; xconn = fsp->conn->sconn->client->connections;
status = smb2srv_session_lookup(xconn, status = smb2srv_session_lookup_conn(xconn,
fsp->vuid, fsp->vuid,
now, now,
&session); &session);
if (NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED) || if (NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED) ||
(session == NULL)) (session == NULL))
{ {

9
source3/smbd/smb2_server.c
View File

@ -393,7 +393,8 @@ static NTSTATUS smbd_smb2_inbuf_parse_compound(struct smbXsrv_connection *xconn,
goto inval; goto inval;
} }
status = smb2srv_session_lookup(xconn, uid, now, &s); status = smb2srv_session_lookup_conn(xconn, uid, now,
&s);
if (s == NULL) { if (s == NULL) {
DEBUG(1, ("invalid session[%llu] in " DEBUG(1, ("invalid session[%llu] in "
"SMB2_TRANSFORM header\n", "SMB2_TRANSFORM header\n",
@ -1833,9 +1834,9 @@ static NTSTATUS smbd_smb2_request_check_session(struct smbd_smb2_request *req)
req->last_session_id = 0; req->last_session_id = 0;
/* lookup an existing session */ /* lookup an existing session */
status = smb2srv_session_lookup(req->xconn, status = smb2srv_session_lookup_conn(req->xconn,
in_session_id, now, in_session_id, now,
&session); &session);
if (session) { if (session) {
req->session = session; req->session = session;
req->last_session_id = in_session_id; req->last_session_id = in_session_id;

6
source3/smbd/smbXsrv_session.c
View File

@ -1767,9 +1767,9 @@ static NTSTATUS smb2srv_session_lookup_raw(struct smbXsrv_session_table *table,
session); session);
} }
NTSTATUS smb2srv_session_lookup(struct smbXsrv_connection *conn, NTSTATUS smb2srv_session_lookup_conn(struct smbXsrv_connection *conn,
uint64_t session_id, NTTIME now, uint64_t session_id, NTTIME now,
struct smbXsrv_session **session) struct smbXsrv_session **session)
{ {
struct smbXsrv_session_table *table = conn->client->session_table; struct smbXsrv_session_table *table = conn->client->session_table;
return smb2srv_session_lookup_raw(table, conn, session_id, now, return smb2srv_session_lookup_raw(table, conn, session_id, now,