From 607e97bef0df1db588c888e21ac6b8826c9282d7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 20 May 2006 12:11:46 +0000 Subject: r15746: - reorder elements of smb2srv_request - move SMB2 specific elements to the end metze (This used to be commit 7d2087bd1b5036f79e205d6e17f2bca78576299e) --- source4/smb_server/smb2/smb2_server.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'source4') diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h index 5f30c8141d..86b4f146be 100644 --- a/source4/smb_server/smb2/smb2_server.h +++ b/source4/smb_server/smb2/smb2_server.h @@ -27,23 +27,31 @@ struct smb2srv_request { /* the server_context contains all context specific to this SMB socket */ struct smbsrv_connection *smb_conn; - /* the smbsrv_session for the request */ + /* conn is only set for operations that have a valid TID */ + struct smbsrv_tcon *tcon; + + /* the session context is derived from the vuid */ struct smbsrv_session *session; - /* the smbsrv_tcon for the request */ - struct smbsrv_tcon *tcon; +#define SMB2SRV_REQ_CTRL_FLAG_NOT_REPLY (1<<0) + uint32_t control_flags; /* the system time when the request arrived */ struct timeval request_time; - /* for matching request and reply */ - uint64_t seqnum; + /* a pointer to the per request union smb_* io structure */ + void *io_ptr; + + /* the ntvfs_request */ + struct ntvfs_request *ntvfs; + + /* Now the SMB2 specific stuff */ /* the status the backend returned */ NTSTATUS status; -#define SMB2SRV_REQ_CTRL_FLAG_NOT_REPLY (1<<0) - uint32_t control_flags; + /* for matching request and reply */ + uint64_t seqnum; struct smb2_request_buffer in; struct smb2_request_buffer out; -- cgit