2 files changed, 237 insertions, 336 deletions

diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 5658a2cc03..109910be1f 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -25,6 +25,10 @@
 #include "dlinklist.h"
 #include "lib/socket/socket.h"
 #include "libcli/wrepl/winsrepl.h"
+#include "lib/stream/packet.h"
+#include "libcli/composite/composite.h"
+
+static struct wrepl_request *wrepl_request_finished(struct wrepl_request *req, NTSTATUS status);
 
 /*
   mark all pending requests as dead - called when a socket error happens
@@ -34,12 +38,15 @@ static void wrepl_socket_dead(struct wrepl_socket *wrepl_socket, NTSTATUS status
 	talloc_set_destructor(wrepl_socket, NULL);
 	wrepl_socket->dead = True;
 
-	if (wrepl_socket->fde) {
-		talloc_free(wrepl_socket->fde);
-		wrepl_socket->fde = NULL;
+	if (wrepl_socket->event.fde) {
+		packet_recv_disable(wrepl_socket->packet);
+		packet_set_fde(wrepl_socket->packet, NULL);
+		talloc_free(wrepl_socket->event.fde);
+		wrepl_socket->event.fde = NULL;
 	}
 
 	if (wrepl_socket->sock) {
+		packet_set_socket(wrepl_socket->packet, NULL);
 		talloc_free(wrepl_socket->sock);
 		wrepl_socket->sock = NULL;
 	}
@@ -47,23 +54,10 @@ static void wrepl_socket_dead(struct wrepl_socket *wrepl_socket, NTSTATUS status
 	if (NT_STATUS_EQUAL(NT_STATUS_UNSUCCESSFUL, status)) {
 		status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
 	}
-	while (wrepl_socket->send_queue) {
-		struct wrepl_request *req = wrepl_socket->send_queue;
-		DLIST_REMOVE(wrepl_socket->send_queue, req);
-		req->state = WREPL_REQUEST_ERROR;
-		req->status = status;
-		if (req->async.fn) {
-			req->async.fn(req);
-		}
-	}
 	while (wrepl_socket->recv_queue) {
 		struct wrepl_request *req = wrepl_socket->recv_queue;
 		DLIST_REMOVE(wrepl_socket->recv_queue, req);
-		req->state = WREPL_REQUEST_ERROR;
-		req->status = status;
-		if (req->async.fn) {
-			req->async.fn(req);
-		}
+		wrepl_request_finished(req, status);
 	}
 }
 
@@ -75,179 +69,38 @@ static void wrepl_request_timeout_handler(struct event_context *ev, struct timed
 }
 
 /*
-  handle send events 
-*/
-static void wrepl_handler_send(struct wrepl_socket *wrepl_socket)
-{
-	while (wrepl_socket->send_queue) {
-		struct wrepl_request *req = wrepl_socket->send_queue;
-		size_t nsent;
-		NTSTATUS status;
-
-		status = socket_send(wrepl_socket->sock, &req->buffer, &nsent, 0);
-		if (NT_STATUS_IS_ERR(status)) {
-			wrepl_socket_dead(wrepl_socket, status);
-			return;
-		}
-		if (!NT_STATUS_IS_OK(status) || nsent == 0) return;
-
-		req->buffer.data   += nsent;
-		req->buffer.length -= nsent;
-		if (req->buffer.length != 0) {
-			return;
-		}
-
-		if (req->disconnect_after_send) {
-			DLIST_REMOVE(wrepl_socket->send_queue, req);
-			req->status = NT_STATUS_OK;
-			req->state = WREPL_REQUEST_DONE;
-			wrepl_socket_dead(wrepl_socket, NT_STATUS_LOCAL_DISCONNECT);
-			if (req->async.fn) {
-				req->async.fn(req);
-			}
-			return;
-		}
-
-		if (req->send_only) {
-			DLIST_REMOVE(wrepl_socket->send_queue, req);
-			req->status = NT_STATUS_OK;
-			req->state = WREPL_REQUEST_DONE;
-			if (req->async.fn) {
-				EVENT_FD_READABLE(wrepl_socket->fde);
-				req->async.fn(req);
-				return;
-			}
-		} else {
-			DLIST_REMOVE(wrepl_socket->send_queue, req);
-			DLIST_ADD_END(wrepl_socket->recv_queue, req, struct wrepl_request *);
-			req->state = WREPL_REQUEST_RECV;
-		}
-
-		EVENT_FD_READABLE(wrepl_socket->fde);
-	}
-
-	EVENT_FD_NOT_WRITEABLE(wrepl_socket->fde);
-}
-
-
-/*
   handle recv events 
 */
-static void wrepl_handler_recv(struct wrepl_socket *wrepl_socket)
+static NTSTATUS wrepl_finish_recv(void *private, DATA_BLOB packet_blob_in)
 {
-	size_t nread;
+	struct wrepl_socket *wrepl_socket = talloc_get_type(private, struct wrepl_socket);
 	struct wrepl_request *req = wrepl_socket->recv_queue;
 	DATA_BLOB blob;
 
-	if (req == NULL) {
-		NTSTATUS status;
-
-		EVENT_FD_NOT_READABLE(wrepl_socket->fde);
-
-		status = socket_recv(wrepl_socket->sock, NULL, 0, &nread, 0);
-		if (NT_STATUS_EQUAL(NT_STATUS_END_OF_FILE,status)) return;
-		if (NT_STATUS_IS_ERR(status)) {
-			wrepl_socket_dead(wrepl_socket, status);
-			return;
-		}
-		return;
-	}
-
-	if (req->buffer.length == 0) {
-		req->buffer = data_blob_talloc(req, NULL, 4);
-		if (req->buffer.data == NULL) {
-			req->status = NT_STATUS_NO_MEMORY;
-			goto failed;
-		}
-		req->num_read = 0;
-	}
-
-	/* read in the packet length */
-	if (req->num_read < 4) {
-		uint32_t req_length;
-
-		req->status = socket_recv(wrepl_socket->sock, 
-					  req->buffer.data + req->num_read,
-					  4 - req->num_read,
-					  &nread, 0);
-		if (NT_STATUS_IS_ERR(req->status)) {
-			wrepl_socket_dead(wrepl_socket, req->status);
-			return;
-		}
-		if (!NT_STATUS_IS_OK(req->status)) return;
-
-		req->num_read += nread;
-		if (req->num_read != 4) return;
-
-		req_length = RIVAL(req->buffer.data, 0) + 4;
-
-		req->buffer.data = talloc_realloc(req, req->buffer.data, 
-						  uint8_t, req_length);
-		if (req->buffer.data == NULL) {
-			req->status = NT_STATUS_NO_MEMORY;
-			goto failed;
-		}
-		req->buffer.length = req_length;
-	}
-
-	/* read in the body */
-	req->status = socket_recv(wrepl_socket->sock, 
-				  req->buffer.data + req->num_read,
-				  req->buffer.length - req->num_read,
-				  &nread, 0);
-	if (NT_STATUS_IS_ERR(req->status)) {
-		wrepl_socket_dead(wrepl_socket, req->status);
-		return;
-	}
-	if (!NT_STATUS_IS_OK(req->status)) return;
-
-	req->num_read += nread;
-	if (req->num_read != req->buffer.length) return;
-
 	req->packet = talloc(req, struct wrepl_packet);
-	if (req->packet == NULL) {
-		req->status = NT_STATUS_NO_MEMORY;
-		goto failed;
-	}
+	NT_STATUS_HAVE_NO_MEMORY(req->packet);
 
-	blob.data = req->buffer.data + 4;
-	blob.length = req->buffer.length - 4;
+	blob.data = packet_blob_in.data + 4;
+	blob.length = packet_blob_in.length - 4;
 	
 	/* we have a full request - parse it */
 	req->status = ndr_pull_struct_blob(&blob,
 					   req->packet, req->packet,
 					   (ndr_pull_flags_fn_t)ndr_pull_wrepl_packet);
 	if (!NT_STATUS_IS_OK(req->status)) {
-		DEBUG(2,("Failed to parse incoming WINS packet - %s\n",
-			 nt_errstr(req->status)));
-		DEBUG(10,("packet length %d\n", (int)req->buffer.length));
-		NDR_PRINT_DEBUG(wrepl_packet, req->packet);
-		goto failed;
+		wrepl_request_finished(req, req->status);
+		return NT_STATUS_OK;
 	}
 
 	if (DEBUGLVL(10)) {
-		DEBUG(10,("Received WINS packet of length %d\n", (int)req->buffer.length));
+		DEBUG(10,("Received WINS packet of length %u\n", packet_blob_in.length));
 		NDR_PRINT_DEBUG(wrepl_packet, req->packet);
 	}
 
-	DLIST_REMOVE(wrepl_socket->recv_queue, req);
-	req->state = WREPL_REQUEST_DONE;
-	if (req->async.fn) {
-		req->async.fn(req);
-	}
-	return;
-
-failed:
-	if (req->state == WREPL_REQUEST_RECV) {
-		DLIST_REMOVE(wrepl_socket->recv_queue, req);
-	}
-	req->state = WREPL_REQUEST_ERROR;
-	if (req->async.fn) {
-		req->async.fn(req);
-	}
+	wrepl_request_finished(req, req->status);
+	return NT_STATUS_OK;
 }
 
-
 /*
   handler for winrepl events
 */
@@ -256,56 +109,23 @@ static void wrepl_handler(struct event_context *ev, struct fd_event *fde,
 {
 	struct wrepl_socket *wrepl_socket = talloc_get_type(private, 
 							    struct wrepl_socket);
-	if (flags & EVENT_FD_WRITE) {
-		wrepl_handler_send(wrepl_socket);
-	}
 	if (flags & EVENT_FD_READ) {
-		wrepl_handler_recv(wrepl_socket);
+		packet_recv(wrepl_socket->packet);
+		return;
+	}
+	if (flags & EVENT_FD_WRITE) {
+		packet_queue_run(wrepl_socket->packet);
 	}
 }
 
-
-/*
-  handler for winrepl connection completion
-*/
-static void wrepl_connect_handler(struct event_context *ev, struct fd_event *fde, 
-				  uint16_t flags, void *private)
+static void wrepl_error(void *private, NTSTATUS status)
 {
 	struct wrepl_socket *wrepl_socket = talloc_get_type(private, 
 							    struct wrepl_socket);
-	struct wrepl_request *req = wrepl_socket->recv_queue;
-
-	talloc_free(wrepl_socket->fde);
-	wrepl_socket->fde = NULL;
-
-	if (req == NULL) return;
-
-	req->status = socket_connect_complete(wrepl_socket->sock, 0);
-	if (NT_STATUS_IS_ERR(req->status)) goto failed;
-
-	if (!NT_STATUS_IS_OK(req->status)) return;
-
-	wrepl_socket->fde = event_add_fd(wrepl_socket->event_ctx, wrepl_socket, 
-					 socket_get_fd(wrepl_socket->sock), 
-					 EVENT_FD_WRITE,
-					 wrepl_handler, wrepl_socket);
-	if (wrepl_socket->fde == NULL) {
-		req->status = NT_STATUS_NO_MEMORY;
-	}
-
-
-failed:
-	DLIST_REMOVE(wrepl_socket->recv_queue, req);
-	if (!NT_STATUS_IS_OK(req->status)) {
-		req->state = WREPL_REQUEST_ERROR;
-	} else {
-		req->state = WREPL_REQUEST_DONE;
-	}
-	if (req->async.fn) {
-		req->async.fn(req);
-	}
+	wrepl_socket_dead(wrepl_socket, status);
 }
 
+
 /*
   destroy a wrepl_socket destructor
 */
@@ -326,35 +146,22 @@ struct wrepl_socket *wrepl_socket_init(TALLOC_CTX *mem_ctx,
 	struct wrepl_socket *wrepl_socket;
 	NTSTATUS status;
 
-	wrepl_socket = talloc(mem_ctx, struct wrepl_socket);
-	if (wrepl_socket == NULL) goto failed;
+	wrepl_socket = talloc_zero(mem_ctx, struct wrepl_socket);
+	if (!wrepl_socket) return NULL;
 
 	if (event_ctx == NULL) {
-		wrepl_socket->event_ctx = event_context_init(wrepl_socket);
+		wrepl_socket->event.ctx = event_context_init(wrepl_socket);
 	} else {
-		wrepl_socket->event_ctx = talloc_reference(wrepl_socket, event_ctx);
+		wrepl_socket->event.ctx = talloc_reference(wrepl_socket, event_ctx);
 	}
-	if (wrepl_socket->event_ctx == NULL) goto failed;
+	if (!wrepl_socket->event.ctx) goto failed;
 
 	status = socket_create("ip", SOCKET_TYPE_STREAM, &wrepl_socket->sock, 0);
 	if (!NT_STATUS_IS_OK(status)) goto failed;
 
 	talloc_steal(wrepl_socket, wrepl_socket->sock);
 
-	wrepl_socket->send_queue	= NULL;
-	wrepl_socket->recv_queue	= NULL;
 	wrepl_socket->request_timeout	= WREPL_SOCKET_REQUEST_TIMEOUT;
-	wrepl_socket->dead		= False;
-
-	wrepl_socket->fde = event_add_fd(wrepl_socket->event_ctx, wrepl_socket, 
-					 socket_get_fd(wrepl_socket->sock), 
-					 EVENT_FD_WRITE,
-					 wrepl_connect_handler, wrepl_socket);
-	if (wrepl_socket->fde == NULL) {
-		goto failed;
-	}
-
-	set_blocking(socket_get_fd(wrepl_socket->sock), False);
 
 	talloc_set_destructor(wrepl_socket, wrepl_socket_destructor);
 
@@ -370,32 +177,42 @@ failed:
 */
 struct wrepl_socket *wrepl_socket_merge(TALLOC_CTX *mem_ctx, 
 				        struct event_context *event_ctx,
-					struct socket_context *socket)
+					struct socket_context *socket,
+					struct packet_context *packet)
 {
 	struct wrepl_socket *wrepl_socket;
 
-	wrepl_socket = talloc(mem_ctx, struct wrepl_socket);
+	wrepl_socket = talloc_zero(mem_ctx, struct wrepl_socket);
 	if (wrepl_socket == NULL) goto failed;
 
-	wrepl_socket->event_ctx = talloc_reference(wrepl_socket, event_ctx);
-	if (wrepl_socket->event_ctx == NULL) goto failed;
+	wrepl_socket->event.ctx = talloc_reference(wrepl_socket, event_ctx);
+	if (wrepl_socket->event.ctx == NULL) goto failed;
 
 	wrepl_socket->sock = socket;
 	talloc_steal(wrepl_socket, wrepl_socket->sock);
 
-	wrepl_socket->send_queue	= NULL;
-	wrepl_socket->recv_queue	= NULL;
+
 	wrepl_socket->request_timeout	= WREPL_SOCKET_REQUEST_TIMEOUT;
-	wrepl_socket->dead		= False;
 
-	wrepl_socket->fde = event_add_fd(wrepl_socket->event_ctx, wrepl_socket,
-					 socket_get_fd(wrepl_socket->sock), 
-					 0,
-					 wrepl_handler, wrepl_socket);
-	if (wrepl_socket->fde == NULL) {
+	wrepl_socket->event.fde = event_add_fd(wrepl_socket->event.ctx, wrepl_socket,
+					       socket_get_fd(wrepl_socket->sock), 
+					       EVENT_FD_READ,
+					       wrepl_handler, wrepl_socket);
+	if (wrepl_socket->event.fde == NULL) {
 		goto failed;
 	}
 
+	wrepl_socket->packet = packet;
+	talloc_steal(wrepl_socket, wrepl_socket->packet);
+	packet_set_private(wrepl_socket->packet, wrepl_socket);
+	packet_set_socket(wrepl_socket->packet, wrepl_socket->sock);
+	packet_set_callback(wrepl_socket->packet, wrepl_finish_recv);
+	packet_set_full_request(wrepl_socket->packet, packet_full_request_u32);
+	packet_set_error_handler(wrepl_socket->packet, wrepl_error);
+	packet_set_event_context(wrepl_socket->packet, wrepl_socket->event.ctx);
+	packet_set_fde(wrepl_socket->packet, wrepl_socket->event.fde);
+	packet_set_serialise(wrepl_socket->packet);
+
 	talloc_set_destructor(wrepl_socket, wrepl_socket_destructor);
 	
 	return wrepl_socket;
@@ -411,9 +228,6 @@ failed:
 static int wrepl_request_destructor(void *ptr)
 {
 	struct wrepl_request *req = talloc_get_type(ptr, struct wrepl_request);
-	if (req->state == WREPL_REQUEST_SEND) {
-		DLIST_REMOVE(req->wrepl_socket->send_queue, req);
-	}
 	if (req->state == WREPL_REQUEST_RECV) {
 		DLIST_REMOVE(req->wrepl_socket->recv_queue, req);
 	}
@@ -428,79 +242,108 @@ static NTSTATUS wrepl_request_wait(struct wrepl_request *req)
 {
 	NT_STATUS_HAVE_NO_MEMORY(req);
 	while (req->state < WREPL_REQUEST_DONE) {
-		event_loop_once(req->wrepl_socket->event_ctx);
+		event_loop_once(req->wrepl_socket->event.ctx);
 	}
 	return req->status;
 }
 
-static void wrepl_request_trigger(struct wrepl_request *req, NTSTATUS status);
+struct wrepl_connect_state {
+	struct composite_context *result;
+	struct wrepl_socket *wrepl_socket;
+	struct composite_context *creq;
+};
+
+/*
+  handler for winrepl connection completion
+*/
+static void wrepl_connect_handler(struct composite_context *creq)
+{
+	struct wrepl_connect_state *state = talloc_get_type(creq->async.private_data, 
+					    struct wrepl_connect_state);
+	struct wrepl_socket *wrepl_socket = state->wrepl_socket;
+	struct composite_context *result = state->result;
+
+	result->status = socket_connect_recv(state->creq);
+	if (!composite_is_ok(result)) return;
+
+	wrepl_socket->event.fde = event_add_fd(wrepl_socket->event.ctx, wrepl_socket, 
+					       socket_get_fd(wrepl_socket->sock), 
+					       EVENT_FD_READ,
+					       wrepl_handler, wrepl_socket);
+	if (composite_nomem(wrepl_socket->event.fde, result)) return;
+
+	/* setup the stream -> packet parser */
+	wrepl_socket->packet = packet_init(wrepl_socket);
+	if (composite_nomem(wrepl_socket->packet, result)) return;
+	packet_set_private(wrepl_socket->packet, wrepl_socket);
+	packet_set_socket(wrepl_socket->packet, wrepl_socket->sock);
+	packet_set_callback(wrepl_socket->packet, wrepl_finish_recv);
+	packet_set_full_request(wrepl_socket->packet, packet_full_request_u32);
+	packet_set_error_handler(wrepl_socket->packet, wrepl_error);
+	packet_set_event_context(wrepl_socket->packet, wrepl_socket->event.ctx);
+	packet_set_fde(wrepl_socket->packet, wrepl_socket->event.fde);
+	packet_set_serialise(wrepl_socket->packet);
+
+	composite_done(result);
+}
 
 /*
   connect a wrepl_socket to a WINS server
 */
-struct wrepl_request *wrepl_connect_send(struct wrepl_socket *wrepl_socket,
-					 const char *our_ip, const char *peer_ip)
+struct composite_context *wrepl_connect_send(struct wrepl_socket *wrepl_socket,
+					     const char *our_ip, const char *peer_ip)
 {
-	struct wrepl_request *req;
-	NTSTATUS status;
+	struct composite_context *result;
+	struct wrepl_connect_state *state;
 
-	req = talloc_zero(wrepl_socket, struct wrepl_request);
-	if (req == NULL) goto failed;
+	result = talloc_zero(wrepl_socket, struct composite_context);
+	if (!result) return NULL;
 
-	req->wrepl_socket = wrepl_socket;
-	req->state        = WREPL_REQUEST_RECV;
-
-	DLIST_ADD_END(wrepl_socket->recv_queue, req, struct wrepl_request *);
+	result->state		= COMPOSITE_STATE_IN_PROGRESS;
+	result->event_ctx	= wrepl_socket->event.ctx;
 
-	talloc_set_destructor(req, wrepl_request_destructor);
+	state = talloc_zero(result, struct wrepl_connect_state);
+	if (composite_nomem(state, result)) return result;
+	result->private_data	= state;
+	state->result		= result;
+	state->wrepl_socket	= wrepl_socket;
 
 	if (!our_ip) {
 		our_ip = iface_best_ip(peer_ip);
 	}
 
-	status = socket_connect(wrepl_socket->sock, our_ip, 0, peer_ip, 
-				WINS_REPLICATION_PORT, 0);
-	if (NT_STATUS_IS_OK(status)) {
-		talloc_free(wrepl_socket->fde);
-
-		wrepl_socket->fde = event_add_fd(wrepl_socket->event_ctx, wrepl_socket, 
-						 socket_get_fd(wrepl_socket->sock), 
-						 EVENT_FD_WRITE,
-						 wrepl_handler, wrepl_socket);
-		if (wrepl_socket->fde == NULL) {
-			status = NT_STATUS_NO_MEMORY;
-		}
-	}
-
-	if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-		req->wrepl_socket = wrepl_socket;
-		wrepl_request_trigger(req, status);
-		return req;
-	}
-
-	return req;
-
-failed:
-	talloc_free(req);
-	return NULL;
+	state->creq = socket_connect_send(wrepl_socket->sock, our_ip, 0,
+					  peer_ip, WINS_REPLICATION_PORT,
+					  0, wrepl_socket->event.ctx);
+	composite_continue(result, state->creq, wrepl_connect_handler, state);
+	return result;
 }
 
 /*
   connect a wrepl_socket to a WINS server - recv side
 */
-NTSTATUS wrepl_connect_recv(struct wrepl_request *req)
+NTSTATUS wrepl_connect_recv(struct composite_context *result)
 {
-	return wrepl_request_wait(req);
-}
+	struct wrepl_connect_state *state = talloc_get_type(result->private_data,
+					    struct wrepl_connect_state);
+	struct wrepl_socket *wrepl_socket = state->wrepl_socket;
+	NTSTATUS status = composite_wait(result);
 
+	if (!NT_STATUS_IS_OK(status)) {
+		wrepl_socket_dead(wrepl_socket, status);
+	}
+
+	talloc_free(result);
+	return status;
+}
 
 /*
   connect a wrepl_socket to a WINS server - sync API
 */
 NTSTATUS wrepl_connect(struct wrepl_socket *wrepl_socket, const char *our_ip, const char *peer_ip)
 {
-	struct wrepl_request *req = wrepl_connect_send(wrepl_socket, our_ip, peer_ip);
-	return wrepl_connect_recv(req);
+	struct composite_context *c_req = wrepl_connect_send(wrepl_socket, our_ip, peer_ip);
+	return wrepl_connect_recv(c_req);
 }
 
 /* 
@@ -517,12 +360,13 @@ static void wrepl_request_trigger_handler(struct event_context *ev, struct timed
 
 /*
   trigger an immediate event on a wrepl_request
+  the return value should only be used in wrepl_request_send()
+  this is the only place where req->trigger is True
 */
-static void wrepl_request_trigger(struct wrepl_request *req, NTSTATUS status)
+static struct wrepl_request *wrepl_request_finished(struct wrepl_request *req, NTSTATUS status)
 {
-	if (req->state == WREPL_REQUEST_SEND) {
-		DLIST_REMOVE(req->wrepl_socket->send_queue, req);
-	}
+	struct timed_event *te;
+
 	if (req->state == WREPL_REQUEST_RECV) {
 		DLIST_REMOVE(req->wrepl_socket->recv_queue, req);
 	}
@@ -535,61 +379,119 @@ static void wrepl_request_trigger(struct wrepl_request *req, NTSTATUS status)
 
 	req->status	= status;
 
-	/* a zero timeout means immediate */
-	event_add_timed(req->wrepl_socket->event_ctx,
-			req, timeval_zero(),
-			wrepl_request_trigger_handler, req);
+	if (req->trigger) {
+		req->trigger = False;
+		/* a zero timeout means immediate */
+		te = event_add_timed(req->wrepl_socket->event.ctx,
+				     req, timeval_zero(),
+				     wrepl_request_trigger_handler, req);
+		if (!te) {
+			talloc_free(req);
+			return NULL;
+		}
+		return req;
+	}
+
+	if (req->async.fn) {
+		req->async.fn(req);
+	}
+	return NULL;
 }
 
+struct wrepl_send_ctrl_state {
+	struct wrepl_send_ctrl ctrl;
+	struct wrepl_request *req;
+	struct wrepl_socket *wrepl_sock;
+};
+
+static int wrepl_send_ctrl_destructor(void *ptr)
+{
+	struct wrepl_send_ctrl_state *s = talloc_get_type(ptr, struct wrepl_send_ctrl_state);
+	struct wrepl_request *req = s->wrepl_sock->recv_queue;
+
+	/* check if the request is still in WREPL_STATE_RECV,
+	 * we need this here because the caller has may called 
+	 * talloc_free(req) and wrepl_send_ctrl_state isn't
+	 * a talloc child of the request, so our s->req pointer
+	 * is maybe invalid!
+	 */
+	for (; req; req = req->next) {
+		if (req == s->req) break;
+	}
+	if (!req) return 0;
+
+	/* here, we need to make sure the async request handler is called
+	 * later in the next event_loop and now now
+	 */
+	req->trigger = True;
+	wrepl_request_finished(req, NT_STATUS_OK);
+
+	if (s->ctrl.disconnect_after_send) {
+		wrepl_socket_dead(s->wrepl_sock, NT_STATUS_LOCAL_DISCONNECT);
+	}
+
+	return 0;
+}
 
 /*
   send a generic wins replication request
 */
 struct wrepl_request *wrepl_request_send(struct wrepl_socket *wrepl_socket,
-					 struct wrepl_packet *packet)
+					 struct wrepl_packet *packet,
+					 struct wrepl_send_ctrl *ctrl)
 {
 	struct wrepl_request *req;
 	struct wrepl_wrap wrap;
+	DATA_BLOB blob;
 
 	req = talloc_zero(wrepl_socket, struct wrepl_request);
-	if (req == NULL) goto failed;
-
+	if (!req) return NULL;
 	req->wrepl_socket = wrepl_socket;
-	req->state        = WREPL_REQUEST_SEND;
-
-	DLIST_ADD_END(wrepl_socket->send_queue, req, struct wrepl_request *);
+	req->state        = WREPL_REQUEST_RECV;
+	req->trigger      = True;
 
+	DLIST_ADD_END(wrepl_socket->recv_queue, req, struct wrepl_request *);
 	talloc_set_destructor(req, wrepl_request_destructor);
 
 	if (wrepl_socket->dead) {
-		req->wrepl_socket = wrepl_socket;
-		wrepl_request_trigger(req, NT_STATUS_INVALID_CONNECTION);
-		return req;
+		return wrepl_request_finished(req, NT_STATUS_INVALID_CONNECTION);
 	}
 
 	wrap.packet = *packet;
-	req->status = ndr_push_struct_blob(&req->buffer, req, &wrap,
+	req->status = ndr_push_struct_blob(&blob, req, &wrap,
 					   (ndr_push_flags_fn_t)ndr_push_wrepl_wrap);
-	if (!NT_STATUS_IS_OK(req->status)) goto failed;
+	if (!NT_STATUS_IS_OK(req->status)) {
+		return wrepl_request_finished(req, req->status);
+	}
 
 	if (DEBUGLVL(10)) {
-		DEBUG(10,("Sending WINS packet of length %d\n", (int)req->buffer.length));
+		DEBUG(10,("Sending WINS packet of length %u\n", blob.length));
 		NDR_PRINT_DEBUG(wrepl_packet, &wrap.packet);
 	}
 
 	if (wrepl_socket->request_timeout > 0) {
-		req->te = event_add_timed(wrepl_socket->event_ctx, req, 
+		req->te = event_add_timed(wrepl_socket->event.ctx, req, 
 					  timeval_current_ofs(wrepl_socket->request_timeout, 0), 
 					  wrepl_request_timeout_handler, req);
+		if (!req->te) return wrepl_request_finished(req, NT_STATUS_NO_MEMORY);
 	}
 
-	EVENT_FD_WRITEABLE(wrepl_socket->fde);
-	
-	return req;
+	if (ctrl && (ctrl->send_only || ctrl->disconnect_after_send)) {
+		struct wrepl_send_ctrl_state *s = talloc(blob.data, struct wrepl_send_ctrl_state);
+		if (!s) return wrepl_request_finished(req, NT_STATUS_NO_MEMORY);
+		s->ctrl		= *ctrl;
+		s->req		= req;
+		s->wrepl_sock	= wrepl_socket;
+		talloc_set_destructor(s, wrepl_send_ctrl_destructor);
+	}
 
-failed:
-	talloc_free(req);
-	return NULL;
+	req->status = packet_send(wrepl_socket->packet, blob);
+	if (!NT_STATUS_IS_OK(req->status)) {
+		return wrepl_request_finished(req, req->status);
+	}
+
+	req->trigger = False;
+	return req;
 }
 
 /*
@@ -615,7 +517,7 @@ NTSTATUS wrepl_request(struct wrepl_socket *wrepl_socket,
 		       struct wrepl_packet *req_packet,
 		       struct wrepl_packet **reply_packet)
 {
-	struct wrepl_request *req = wrepl_request_send(wrepl_socket, req_packet);
+	struct wrepl_request *req = wrepl_request_send(wrepl_socket, req_packet, NULL);
 	return wrepl_request_recv(req, mem_ctx, reply_packet);
 }
 
@@ -637,7 +539,7 @@ struct wrepl_request *wrepl_associate_send(struct wrepl_socket *wrepl_socket,
 	packet->message.start.minor_version = 2;
 	packet->message.start.major_version = 5;
 
-	req = wrepl_request_send(wrepl_socket, packet);
+	req = wrepl_request_send(wrepl_socket, packet, NULL);
 
 	talloc_free(packet);
 
@@ -683,6 +585,7 @@ struct wrepl_request *wrepl_associate_stop_send(struct wrepl_socket *wrepl_socke
 {
 	struct wrepl_packet *packet;
 	struct wrepl_request *req;
+	struct wrepl_send_ctrl ctrl;
 
 	packet = talloc_zero(wrepl_socket, struct wrepl_packet);
 	if (packet == NULL) return NULL;
@@ -692,13 +595,14 @@ struct wrepl_request *wrepl_associate_stop_send(struct wrepl_socket *wrepl_socke
 	packet->mess_type		= WREPL_STOP_ASSOCIATION;
 	packet->message.stop.reason	= io->in.reason;
 
-	req = wrepl_request_send(wrepl_socket, packet);
-
-	if (req && io->in.reason == 0) {
-		req->send_only			= True;
-		req->disconnect_after_send	= True;
+	ZERO_STRUCT(ctrl);
+	if (io->in.reason == 0) {
+		ctrl.send_only			= True;
+		ctrl.disconnect_after_send	= True;
 	}
 
+	req = wrepl_request_send(wrepl_socket, packet, &ctrl);
+
 	talloc_free(packet);
 
 	return req;	
@@ -745,7 +649,7 @@ struct wrepl_request *wrepl_pull_table_send(struct wrepl_socket *wrepl_socket,
 	packet->mess_type                   = WREPL_REPLICATION;
 	packet->message.replication.command = WREPL_REPL_TABLE_QUERY;
 
-	req = wrepl_request_send(wrepl_socket, packet);
+	req = wrepl_request_send(wrepl_socket, packet, NULL);
 
 	talloc_free(packet);
 
@@ -817,7 +721,7 @@ struct wrepl_request *wrepl_pull_names_send(struct wrepl_socket *wrepl_socket,
 	packet->message.replication.command    = WREPL_REPL_SEND_REQUEST;
 	packet->message.replication.info.owner = io->in.partner;
 
-	req = wrepl_request_send(wrepl_socket, packet);
+	req = wrepl_request_send(wrepl_socket, packet, NULL);
 
 	talloc_free(packet);
 
diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h
index 89a4c642b2..9bedfe7548 100644
--- a/source4/libcli/wrepl/winsrepl.h
+++ b/source4/libcli/wrepl/winsrepl.h
@@ -28,17 +28,16 @@
 */
 struct wrepl_socket {
 	struct socket_context *sock;
-	struct event_context *event_ctx;
+	struct packet_context *packet;
 
-	/* a queue of requests pending to be sent */
-	struct wrepl_request *send_queue;
+	struct {
+		struct event_context *ctx;
+		struct fd_event *fde;
+	} event;
 
 	/* a queue of replies waiting to be received */
 	struct wrepl_request *recv_queue;
 
-	/* the fd event */
-	struct fd_event *fde;
-
 	/* the default timeout for requests, 0 means no timeout */
 #define WREPL_SOCKET_REQUEST_TIMEOUT	(60)
 	uint32_t request_timeout;
@@ -50,8 +49,13 @@ struct wrepl_socket {
 	BOOL dead;
 };
 
+struct wrepl_send_ctrl {
+	BOOL send_only;
+	BOOL disconnect_after_send;
+};
+
 enum wrepl_request_state {
-	WREPL_REQUEST_SEND  = 0,
+	WREPL_REQUEST_INIT  = 0,
 	WREPL_REQUEST_RECV  = 1,
 	WREPL_REQUEST_DONE  = 2,
 	WREPL_REQUEST_ERROR = 3
@@ -65,16 +69,9 @@ struct wrepl_request {
 	struct wrepl_socket *wrepl_socket;
 
 	enum wrepl_request_state state;
+	BOOL trigger;
 	NTSTATUS status;
 
-	DATA_BLOB buffer;
-
-	BOOL disconnect_after_send;
-
-	BOOL send_only;
-
-	size_t num_read;
-
 	struct timed_event *te;
 
 	struct wrepl_packet *packet;