svn commit: samba r15746 - in branches/SAMBA_4_0/source/smb_server/smb2: .

[metze at samba.org]

Author: metze
Date: 2006-05-20 12:11:46 +0000 (Sat, 20 May 2006)
New Revision: 15746

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15746

Log:
- reorder elements of smb2srv_request
- move SMB2 specific elements to the end

metze
Modified:
   branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h	2006-05-20 12:08:27 UTC (rev 15745)
+++ branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h	2006-05-20 12:11:46 UTC (rev 15746)
@@ -27,23 +27,31 @@
 	/* 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;