From 77d1b29e25512982a1f912adac46bb954ee3d19f Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 25 Aug 2008 14:40:15 +0200
Subject: Move "struct cli_request" from client.h to async_smb.h

Also add some comments
(This used to be commit 2ecc311f785317caf5b60051147dcd085c80d64f)
---
 source3/include/async_smb.h | 63 +++++++++++++++++++++++++++++++++++++++++++++
 source3/include/client.h    | 27 +++----------------
 2 files changed, 66 insertions(+), 24 deletions(-)

(limited to 'source3/include')

diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h
index 93d2273239..031ab233dd 100644
--- a/source3/include/async_smb.h
+++ b/source3/include/async_smb.h
@@ -17,8 +17,69 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef __ASYNC_SMB_H__
+#define __ASYNC_SMB_H__
+
 #include "includes.h"
 
+struct cli_request {
+	/**
+	 * "prev" and "next" form the doubly linked list in
+	 * cli_state->outstanding_requests
+	 */
+	struct cli_request *prev, *next;
+
+	/**
+	 * "our" struct async_req;
+	 */
+	struct async_req *async;
+
+	/**
+	 * The client connection for this request
+	 */
+	struct cli_state *cli;
+
+	/**
+	 * The enc_state to decrypt the reply
+	 */
+	struct smb_trans_enc_state *enc_state;
+
+	/**
+	 * The mid we used for this request. Mainly used to demultiplex on
+	 * receiving replies.
+	 */
+	uint16_t mid;
+
+	/**
+	 * The bytes we have to ship to the server
+	 */
+	char *outbuf;
+
+	/**
+	 * How much from "outbuf" did we already send
+	 */
+	size_t sent;
+
+	/**
+	 * The reply comes in here. Its intended size is implicit by
+	 * smb_len(), its current size can be read via talloc_get_size()
+	 */
+	char *inbuf;
+
+	/**
+	 * Specific requests might add stuff here. Maybe convert this to a
+	 * private_pointer at some point.
+	 */
+	union {
+		struct {
+			off_t ofs;
+			size_t size;
+			ssize_t received;
+			uint8_t *rcvbuf;
+		} read;
+	} data;
+};
+
 /*
  * Ship a new smb request to the server
  */
@@ -52,3 +113,5 @@ NTSTATUS cli_pull_error(char *buf);
  */
 
 void cli_set_error(struct cli_state *cli, NTSTATUS status);
+
+#endif
diff --git a/source3/include/client.h b/source3/include/client.h
index be12288f28..6a6e1a2faa 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -216,33 +216,12 @@ struct cli_state {
 	struct fd_event *fd_event;
 	char *evt_inbuf;
 
+	/**
+	 * A linked list of requests that are waiting for a reply
+	 */
 	struct cli_request *outstanding_requests;
 };
 
-struct cli_request {
-	struct cli_request *prev, *next;
-	struct async_req *async;
-
-	struct cli_state *cli;
-
-	struct smb_trans_enc_state *enc_state;
-
-	uint16_t mid;
-
-	char *outbuf;
-	size_t sent;
-	char *inbuf;
-
-	union {
-		struct {
-			off_t ofs;
-			size_t size;
-			ssize_t received;
-			uint8_t *rcvbuf;
-		} read;
-	} data;
-};
-
 typedef struct file_info {
 	struct cli_state *cli;
 	SMB_BIG_UINT size;
-- 
cgit