libcli/raw: add a recv_helper hook infrastructure

The recv helper will be called when a response comes
and the recv helper can decide to let the request
on the SMBCLI_REQUEST_RECV when more reponse packets
are expected. It's up to the helper function
to keep a reference to the in buffers, each incoming
response overwrites req->in.

metze
(This used to be commit 6d84af89ba96627abe142ba7080c24ae2421ed6c)

2 files changed, 23 insertions, 1 deletions

diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 34fb96230d..e95ae3271e 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -480,8 +480,22 @@ async:
 	/* if this request has an async handler then call that to
 	   notify that the reply has been received. This might destroy
 	   the request so it must happen last */
-	DLIST_REMOVE(transport->pending_recv, req);
+
 	req->state = SMBCLI_REQUEST_DONE;
+
+	if (req->recv_helper.fn) {
+		/*
+		 * let the recv helper decide in
+		 * what state the request really is
+		 */
+		req->state = req->recv_helper.fn(req);
+
+		/* if more parts are needed, wait for them */
+		if (req->state <= SMBCLI_REQUEST_RECV) {
+			return NT_STATUS_OK;
+		}
+	}
+	DLIST_REMOVE(transport->pending_recv, req);
 	if (req->async.fn) {
 		req->async.fn(req);
 	}
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 16a98ad66e..d55b4cc42c 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -231,6 +231,14 @@ struct smbcli_request {
 	struct smbcli_session *session;
 	struct smbcli_tree *tree;
 
+	/* a receive helper, smbcli_transport_finish_recv will not call
+	   req->async.fn callback handler unless the recv_helper returns
+	   a value > SMBCLI_REQUEST_RECV. */
+	struct {
+		enum smbcli_request_state (*fn)(struct smbcli_request *);
+		void *private_data;
+	} recv_helper;
+
 	/* the flags2 from the SMB request, in raw form (host byte
 	   order). Used to parse strings */
 	uint16_t flags2;