s3: fix crash in winbindd
[ira/wip.git] / source3 / libsmb / async_smb.c
index fd2fe930f84639c7ecfe190e240383fb950fcf55..17040b8c9f43eaeae7038658c2ee74db23932cb1 100644 (file)
@@ -19,9 +19,6 @@
 
 #include "includes.h"
 
-static void cli_state_handler(struct event_context *event_ctx,
-                             struct fd_event *event, uint16 flags, void *p);
-
 /**
  * Fetch an error out of a NBT packet
  * @param[in] buf      The SMB packet
@@ -68,115 +65,6 @@ void cli_set_error(struct cli_state *cli, NTSTATUS status)
        return;
 }
 
-/**
- * Allocate a new mid
- * @param[in] cli      The client connection
- * @retval             The new, unused mid
- */
-
-static uint16_t cli_new_mid(struct cli_state *cli)
-{
-       uint16_t result;
-       struct cli_request *req;
-
-       while (true) {
-               result = cli->mid++;
-               if (result == 0) {
-                       continue;
-               }
-
-               for (req = cli->outstanding_requests; req; req = req->next) {
-                       if (result == req->mid) {
-                               break;
-                       }
-               }
-
-               if (req == NULL) {
-                       return result;
-               }
-       }
-}
-
-/**
- * Print an async req that happens to be a cli_request
- * @param[in] mem_ctx  The TALLOC_CTX to put the result on
- * @param[in] req      The request to print
- * @retval             The string representation of "req"
- */
-
-static char *cli_request_print(TALLOC_CTX *mem_ctx, struct async_req *req)
-{
-       char *result = async_req_print(mem_ctx, req);
-       struct cli_request *cli_req = talloc_get_type_abort(
-               req->private_data, struct cli_request);
-
-       if (result == NULL) {
-               return NULL;
-       }
-
-       return talloc_asprintf_append_buffer(
-               result, "mid=%d\n", cli_req->mid);
-}
-
-/**
- * Destroy a cli_request
- * @param[in] req      The cli_request to kill
- * @retval Can't fail
- */
-
-static int cli_request_destructor(struct cli_request *req)
-{
-       if (req->enc_state != NULL) {
-               common_free_enc_buffer(req->enc_state, req->outbuf);
-       }
-       DLIST_REMOVE(req->cli->outstanding_requests, req);
-       if (req->cli->outstanding_requests == NULL) {
-               TALLOC_FREE(req->cli->fd_event);
-       }
-       return 0;
-}
-
-/**
- * Are there already requests waiting in the chain_accumulator?
- * @param[in] cli      The cli_state we want to check
- * @retval reply :-)
- */
-
-bool cli_in_chain(struct cli_state *cli)
-{
-       if (cli->chain_accumulator == NULL) {
-               return false;
-       }
-
-       return (cli->chain_accumulator->num_async != 0);
-}
-
-/**
- * Is the SMB command able to hold an AND_X successor
- * @param[in] cmd      The SMB command in question
- * @retval Can we add a chained request after "cmd"?
- */
-
-static bool is_andx_req(uint8_t cmd)
-{
-       switch (cmd) {
-       case SMBtconX:
-       case SMBlockingX:
-       case SMBopenX:
-       case SMBreadX:
-       case SMBwriteX:
-       case SMBsesssetupX:
-       case SMBulogoffX:
-       case SMBntcreateX:
-               return true;
-               break;
-       default:
-               break;
-       }
-
-       return false;
-}
-
 /**
  * @brief Find the smb_cmd offset of the last command pushed
  * @param[in] buf      The buffer we're building up
@@ -187,7 +75,7 @@ static bool is_andx_req(uint8_t cmd)
  * to the chain. Find the offset to the place where we have to put our cmd.
  */
 
-static bool find_andx_cmd_ofs(char *buf, size_t *pofs)
+static bool find_andx_cmd_ofs(uint8_t *buf, size_t *pofs)
 {
        uint8_t cmd;
        size_t ofs;
@@ -231,12 +119,12 @@ static bool find_andx_cmd_ofs(char *buf, size_t *pofs)
  * *poutbuf.
  */
 
-bool smb_splice_chain(char **poutbuf, uint8_t smb_command,
+bool smb_splice_chain(uint8_t **poutbuf, uint8_t smb_command,
                      uint8_t wct, const uint16_t *vwv,
                      size_t bytes_alignment,
-                     uint16_t num_bytes, const uint8_t *bytes)
+                     uint32_t num_bytes, const uint8_t *bytes)
 {
-       char *outbuf;
+       uint8_t *outbuf;
        size_t old_size, new_size;
        size_t ofs;
        size_t chain_padding = 0;
@@ -269,18 +157,18 @@ bool smb_splice_chain(char **poutbuf, uint8_t smb_command,
        new_size = old_size + chain_padding + 1 + wct * sizeof(uint16_t) + 2;
 
        if ((bytes_alignment != 0) && ((new_size % bytes_alignment) != 0)) {
-               bytes_padding = bytes_alignment + (new_size % bytes_alignment);
+               bytes_padding = bytes_alignment - (new_size % bytes_alignment);
        }
 
        new_size += bytes_padding + num_bytes;
 
-       if (new_size > 0xffff) {
+       if ((smb_command != SMBwriteX) && (new_size > 0xffff)) {
                DEBUG(1, ("splice_chain: %u bytes won't fit\n",
                          (unsigned)new_size));
                return false;
        }
 
-       outbuf = TALLOC_REALLOC_ARRAY(NULL, *poutbuf, char, new_size);
+       outbuf = TALLOC_REALLOC_ARRAY(NULL, *poutbuf, uint8_t, new_size);
        if (outbuf == NULL) {
                DEBUG(0, ("talloc failed\n"));
                return false;
@@ -295,7 +183,7 @@ bool smb_splice_chain(char **poutbuf, uint8_t smb_command,
                if (!find_andx_cmd_ofs(outbuf, &andx_cmd_ofs)) {
                        DEBUG(1, ("invalid command chain\n"));
                        *poutbuf = TALLOC_REALLOC_ARRAY(
-                               NULL, *poutbuf, char, old_size);
+                               NULL, *poutbuf, uint8_t, old_size);
                        return false;
                }
 
@@ -310,387 +198,660 @@ bool smb_splice_chain(char **poutbuf, uint8_t smb_command,
 
        ofs = old_size;
 
+       /*
+        * Push the chained request:
+        *
+        * wct field
+        */
+
        SCVAL(outbuf, ofs, wct);
        ofs += 1;
 
+       /*
+        * vwv array
+        */
+
        memcpy(outbuf + ofs, vwv, sizeof(uint16_t) * wct);
        ofs += sizeof(uint16_t) * wct;
 
+       /*
+        * bcc (byte count)
+        */
+
        SSVAL(outbuf, ofs, num_bytes + bytes_padding);
        ofs += sizeof(uint16_t);
 
+       /*
+        * padding
+        */
+
        if (bytes_padding != 0) {
                memset(outbuf + ofs, 0, bytes_padding);
                ofs += bytes_padding;
        }
 
+       /*
+        * The bytes field
+        */
+
        memcpy(outbuf + ofs, bytes, num_bytes);
 
        return true;
 }
 
 /**
- * @brief Destroy an async_req that is the visible part of a cli_request
- * @param[in] req      The request to kill
- * @retval Return 0 to make talloc happy
- *
- * This destructor is a bit tricky: Because a cli_request can host more than
- * one async_req for chained requests, we need to make sure that the
- * "cli_request" that we were part of is correctly destroyed at the right
- * time. This is done by NULLing out ourself from the "async" member of our
- * "cli_request". If there is none left, then also TALLOC_FREE() the
- * cli_request, which was a talloc child of the client connection cli_state.
+ * Figure out if there is an andx command behind the current one
+ * @param[in] buf      The smb buffer to look at
+ * @param[in] ofs      The offset to the wct field that is followed by the cmd
+ * @retval Is there a command following?
  */
 
-static int cli_async_req_destructor(struct async_req *req)
+static bool have_andx_command(const char *buf, uint16_t ofs)
 {
-       struct cli_request *cli_req = talloc_get_type_abort(
-               req->private_data, struct cli_request);
-       int i, pending;
-       bool found = false;
+       uint8_t wct;
+       size_t buflen = talloc_get_size(buf);
 
-       pending = 0;
+       if ((ofs == buflen-1) || (ofs == buflen)) {
+               return false;
+       }
 
-       for (i=0; i<cli_req->num_async; i++) {
-               if (cli_req->async[i] == req) {
-                       cli_req->async[i] = NULL;
-                       found = true;
-               }
-               if (cli_req->async[i] != NULL) {
-                       pending += 1;
-               }
+       wct = CVAL(buf, ofs);
+       if (wct < 2) {
+               /*
+                * Not enough space for the command and a following pointer
+                */
+               return false;
        }
+       return (CVAL(buf, ofs+1) != 0xff);
+}
 
-       SMB_ASSERT(found);
+#define MAX_SMB_IOV 5
 
-       if (pending == 0) {
-               TALLOC_FREE(cli_req);
-       }
+struct cli_smb_state {
+       struct tevent_context *ev;
+       struct cli_state *cli;
+       uint8_t header[smb_wct+1]; /* Space for the header including the wct */
 
-       return 0;
-}
+       /*
+        * For normal requests, cli_smb_req_send chooses a mid. Secondary
+        * trans requests need to use the mid of the primary request, so we
+        * need a place to store it. Assume it's set if != 0.
+        */
+       uint16_t mid;
 
-/**
- * @brief Chain up a request
- * @param[in] mem_ctx          The TALLOC_CTX for the result
- * @param[in] ev               The event context that will call us back
- * @param[in] cli              The cli_state we queue the request up for
- * @param[in] smb_command      The command that we want to issue
- * @param[in] additional_flags open_and_x wants to add oplock header flags
- * @param[in] wct              How many words?
- * @param[in] vwv              The words, already in network order
- * @param[in] num_bytes                How many bytes?
- * @param[in] bytes            The data the request ships
- *
- * cli_request_chain() is the core of the SMB request marshalling routine. It
- * will create a new async_req structure in the cli->chain_accumulator->async
- * array and marshall the smb_cmd, the vwv array and the bytes into
- * cli->chain_accumulator->outbuf.
- */
+       uint16_t *vwv;
+       uint8_t bytecount_buf[2];
+
+       struct iovec iov[MAX_SMB_IOV+3];
+       int iov_count;
 
-static struct async_req *cli_request_chain(TALLOC_CTX *mem_ctx,
-                                          struct event_context *ev,
-                                          struct cli_state *cli,
-                                          uint8_t smb_command,
-                                          uint8_t additional_flags,
-                                          uint8_t wct, const uint16_t *vwv,
-                                          uint16_t num_bytes,
-                                          const uint8_t *bytes)
+       uint8_t *inbuf;
+       uint32_t seqnum;
+       int chain_num;
+       struct tevent_req **chained_requests;
+};
+
+static uint16_t cli_alloc_mid(struct cli_state *cli)
 {
-       struct async_req **tmp_reqs;
-       struct cli_request *req;
+       int num_pending = talloc_array_length(cli->pending);
+       uint16_t result;
 
-       req = cli->chain_accumulator;
+       while (true) {
+               int i;
 
-       tmp_reqs = TALLOC_REALLOC_ARRAY(req, req->async, struct async_req *,
-                                       req->num_async + 1);
-       if (tmp_reqs == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               return NULL;
+               result = cli->mid++;
+               if ((result == 0) || (result == 0xffff)) {
+                       continue;
+               }
+
+               for (i=0; i<num_pending; i++) {
+                       if (result == cli_smb_req_mid(cli->pending[i])) {
+                               break;
+                       }
+               }
+
+               if (i == num_pending) {
+                       return result;
+               }
        }
-       req->async = tmp_reqs;
-       req->num_async += 1;
+}
 
-       req->async[req->num_async-1] = async_req_new(mem_ctx, ev);
-       if (req->async[req->num_async-1] == NULL) {
-               DEBUG(0, ("async_req_new failed\n"));
-               req->num_async -= 1;
-               return NULL;
+void cli_smb_req_unset_pending(struct tevent_req *req)
+{
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
+       struct cli_state *cli = state->cli;
+       int num_pending = talloc_array_length(cli->pending);
+       int i;
+
+       if (num_pending == 1) {
+               /*
+                * The pending read_smb tevent_req is a child of
+                * cli->pending. So if nothing is pending anymore, we need to
+                * delete the socket read fde.
+                */
+               TALLOC_FREE(cli->pending);
+               return;
        }
-       req->async[req->num_async-1]->private_data = req;
-       req->async[req->num_async-1]->print = cli_request_print;
-       talloc_set_destructor(req->async[req->num_async-1],
-                             cli_async_req_destructor);
 
-       if (!smb_splice_chain(&req->outbuf, smb_command, wct, vwv,
-                             0, num_bytes, bytes)) {
-               goto fail;
+       for (i=0; i<num_pending; i++) {
+               if (req == cli->pending[i]) {
+                       break;
+               }
+       }
+       if (i == num_pending) {
+               /*
+                * Something's seriously broken. Just returning here is the
+                * right thing nevertheless, the point of this routine is to
+                * remove ourselves from cli->pending.
+                */
+               return;
        }
 
-       return req->async[req->num_async-1];
+       /*
+        * Remove ourselves from the cli->pending array
+        */
+       if (num_pending > 1) {
+               cli->pending[i] = cli->pending[num_pending-1];
+       }
 
- fail:
-       TALLOC_FREE(req->async[req->num_async-1]);
-       req->num_async -= 1;
-       return NULL;
+       /*
+        * No NULL check here, we're shrinking by sizeof(void *), and
+        * talloc_realloc just adjusts the size for this.
+        */
+       cli->pending = talloc_realloc(NULL, cli->pending, struct tevent_req *,
+                                     num_pending - 1);
+       return;
 }
 
-/**
- * @brief prepare a cli_state to accept a chain of requests
- * @param[in] cli      The cli_state we want to queue up in
- * @param[in] ev       The event_context that will call us back for the socket
- * @param[in] size_hint        How many bytes are expected, just an optimization
- * @retval Did we have enough memory?
- *
- * cli_chain_cork() sets up a new cli_request in cli->chain_accumulator. If
- * cli is used in an async fashion, i.e. if we have outstanding requests, then
- * we do not have to create a fd event. If cli is used only with the sync
- * helpers, we need to create the fd_event here.
- *
- * If you want to issue a chained request to the server, do a
- * cli_chain_cork(), then do you cli_open_send(), cli_read_and_x_send(),
- * cli_close_send() and so on. The async requests that come out of
- * cli_xxx_send() are normal async requests with the difference that they
- * won't be shipped individually. But the event_context will still trigger the
- * req->async.fn to be called on every single request.
- *
- * You have to take care yourself that you only issue chainable requests in
- * the middle of the chain.
- */
+static int cli_smb_req_destructor(struct tevent_req *req)
+{
+       cli_smb_req_unset_pending(req);
+       return 0;
+}
 
-bool cli_chain_cork(struct cli_state *cli, struct event_context *ev,
-                   size_t size_hint)
+static void cli_smb_received(struct tevent_req *subreq);
+
+bool cli_smb_req_set_pending(struct tevent_req *req)
 {
-       struct cli_request *req = NULL;
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
+       struct cli_state *cli;
+       struct tevent_req **pending;
+       int num_pending;
+       struct tevent_req *subreq;
+
+       cli = state->cli;
+       num_pending = talloc_array_length(cli->pending);
+
+       pending = talloc_realloc(cli, cli->pending, struct tevent_req *,
+                                num_pending+1);
+       if (pending == NULL) {
+               return false;
+       }
+       pending[num_pending] = req;
+       cli->pending = pending;
+       talloc_set_destructor(req, cli_smb_req_destructor);
 
-       SMB_ASSERT(cli->chain_accumulator == NULL);
+       if (num_pending > 0) {
+               return true;
+       }
 
-       if (cli->fd == -1) {
-               DEBUG(10, ("cli->fd closed\n"));
+       /*
+        * We're the first ones, add the read_smb request that waits for the
+        * answer from the server
+        */
+       subreq = read_smb_send(cli->pending, state->ev, cli->fd);
+       if (subreq == NULL) {
+               cli_smb_req_unset_pending(req);
                return false;
        }
+       tevent_req_set_callback(subreq, cli_smb_received, cli);
+       return true;
+}
 
-       if (cli->fd_event == NULL) {
-               SMB_ASSERT(cli->outstanding_requests == NULL);
-               cli->fd_event = event_add_fd(ev, cli, cli->fd,
-                                            EVENT_FD_READ,
-                                            cli_state_handler, cli);
-               if (cli->fd_event == NULL) {
-                       return false;
-               }
+/*
+ * Fetch a smb request's mid. Only valid after the request has been sent by
+ * cli_smb_req_send().
+ */
+uint16_t cli_smb_req_mid(struct tevent_req *req)
+{
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
+       return SVAL(state->header, smb_mid);
+}
+
+void cli_smb_req_set_mid(struct tevent_req *req, uint16_t mid)
+{
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
+       state->mid = mid;
+}
+
+static size_t iov_len(const struct iovec *iov, int count)
+{
+       size_t result = 0;
+       int i;
+       for (i=0; i<count; i++) {
+               result += iov[i].iov_len;
        }
+       return result;
+}
 
-       req = talloc(cli, struct cli_request);
-       if (req == NULL) {
-               goto fail;
+static uint8_t *iov_concat(TALLOC_CTX *mem_ctx, const struct iovec *iov,
+                          int count)
+{
+       size_t len = iov_len(iov, count);
+       size_t copied;
+       uint8_t *buf;
+       int i;
+
+       buf = talloc_array(mem_ctx, uint8_t, len);
+       if (buf == NULL) {
+               return NULL;
+       }
+       copied = 0;
+       for (i=0; i<count; i++) {
+               memcpy(buf+copied, iov[i].iov_base, iov[i].iov_len);
+               copied += iov[i].iov_len;
+       }
+       return buf;
+}
+
+struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
+                                     struct event_context *ev,
+                                     struct cli_state *cli,
+                                     uint8_t smb_command,
+                                     uint8_t additional_flags,
+                                     uint8_t wct, uint16_t *vwv,
+                                     int iov_count,
+                                     struct iovec *bytes_iov)
+{
+       struct tevent_req *result;
+       struct cli_smb_state *state;
+
+       if (iov_count > MAX_SMB_IOV) {
+               /*
+                * Should not happen :-)
+                */
+               return NULL;
        }
-       req->cli = cli;
 
-       if (size_hint == 0) {
-               size_hint = 100;
+       result = tevent_req_create(mem_ctx, &state, struct cli_smb_state);
+       if (result == NULL) {
+               return NULL;
        }
-       req->outbuf = talloc_array(req, char, smb_wct + size_hint);
-       if (req->outbuf == NULL) {
-               goto fail;
+       state->ev = ev;
+       state->cli = cli;
+       state->mid = 0;         /* Set to auto-choose in cli_smb_req_send */
+       state->chain_num = 0;
+       state->chained_requests = NULL;
+
+       cli_setup_packet_buf(cli, (char *)state->header);
+       SCVAL(state->header, smb_com, smb_command);
+       SSVAL(state->header, smb_tid, cli->cnum);
+       SCVAL(state->header, smb_wct, wct);
+
+       state->vwv = vwv;
+
+       SSVAL(state->bytecount_buf, 0, iov_len(bytes_iov, iov_count));
+
+       state->iov[0].iov_base = state->header;
+       state->iov[0].iov_len  = sizeof(state->header);
+       state->iov[1].iov_base = state->vwv;
+       state->iov[1].iov_len  = wct * sizeof(uint16_t);
+       state->iov[2].iov_base = state->bytecount_buf;
+       state->iov[2].iov_len  = sizeof(uint16_t);
+
+       if (iov_count != 0) {
+               memcpy(&state->iov[3], bytes_iov,
+                      iov_count * sizeof(*bytes_iov));
        }
-       req->outbuf = TALLOC_REALLOC_ARRAY(NULL, req->outbuf, char, smb_wct);
+       state->iov_count = iov_count + 3;
 
-       req->num_async = 0;
-       req->async = NULL;
+       return result;
+}
 
-       req->enc_state = NULL;
-       req->recv_helper.fn = NULL;
+static bool cli_signv(struct cli_state *cli, struct iovec *iov, int count,
+                     uint32_t *seqnum)
+{
+       uint8_t *buf;
 
-       SSVAL(req->outbuf, smb_tid, cli->cnum);
-       cli_setup_packet_buf(cli, req->outbuf);
+       /*
+        * Obvious optimization: Make cli_calculate_sign_mac work with struct
+        * iovec directly. MD5Update would do that just fine.
+        */
 
-       req->mid = cli_new_mid(cli);
+       if ((count <= 0) || (iov[0].iov_len < smb_wct)) {
+               return false;
+       }
 
-       cli->chain_accumulator = req;
+       buf = iov_concat(talloc_tos(), iov, count);
+       if (buf == NULL) {
+               return false;
+       }
 
-       DEBUG(10, ("cli_chain_cork: mid=%d\n", req->mid));
+       cli_calculate_sign_mac(cli, (char *)buf, seqnum);
+       memcpy(iov[0].iov_base, buf, iov[0].iov_len);
 
+       TALLOC_FREE(buf);
        return true;
- fail:
-       TALLOC_FREE(req);
-       if (cli->outstanding_requests == NULL) {
-               TALLOC_FREE(cli->fd_event);
-       }
-       return false;
 }
 
-/**
- * Ship a request queued up via cli_request_chain()
- * @param[in] cl       The connection
- */
+static void cli_smb_sent(struct tevent_req *subreq);
 
-void cli_chain_uncork(struct cli_state *cli)
+static bool cli_smb_req_iov_send(struct tevent_req *req,
+                                struct cli_smb_state *state,
+                                struct iovec *iov, int iov_count)
 {
-       struct cli_request *req = cli->chain_accumulator;
-
-       SMB_ASSERT(req != NULL);
+       struct tevent_req *subreq;
 
-       DLIST_ADD_END(cli->outstanding_requests, req, struct cli_request *);
-       talloc_set_destructor(req, cli_request_destructor);
+       if (iov[0].iov_len < smb_wct) {
+               return false;
+       }
 
-       cli->chain_accumulator = NULL;
+       if (state->mid != 0) {
+               SSVAL(iov[0].iov_base, smb_mid, state->mid);
+       } else {
+               SSVAL(iov[0].iov_base, smb_mid, cli_alloc_mid(state->cli));
+       }
 
-       SSVAL(req->outbuf, smb_mid, req->mid);
-       smb_setlen(req->outbuf, talloc_get_size(req->outbuf) - 4);
+       smb_setlen((char *)iov[0].iov_base, iov_len(iov, iov_count) - 4);
 
-       cli_calculate_sign_mac(cli, req->outbuf);
+       if (!cli_signv(state->cli, iov, iov_count, &state->seqnum)) {
+               return false;
+       }
 
-       if (cli_encryption_on(cli)) {
+       if (cli_encryption_on(state->cli)) {
                NTSTATUS status;
-               char *enc_buf;
+               char *buf, *enc_buf;
 
-               status = cli_encrypt_message(cli, req->outbuf, &enc_buf);
+               buf = (char *)iov_concat(talloc_tos(), iov, iov_count);
+               if (buf == NULL) {
+                       return false;
+               }
+               status = cli_encrypt_message(state->cli, (char *)buf,
+                                            &enc_buf);
+               TALLOC_FREE(buf);
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("Error in encrypting client message. "
-                                 "Error %s\n", nt_errstr(status)));
-                       TALLOC_FREE(req);
-                       return;
+                       DEBUG(0, ("Error in encrypting client message: %s\n",
+                                 nt_errstr(status)));
+                       return false;
+               }
+               buf = (char *)talloc_memdup(state, enc_buf,
+                                           smb_len(enc_buf)+4);
+               SAFE_FREE(enc_buf);
+               if (buf == NULL) {
+                       return false;
                }
-               req->outbuf = enc_buf;
-               req->enc_state = cli->trans_enc_state;
+               iov[0].iov_base = buf;
+               iov[0].iov_len = talloc_get_size(buf);
+               subreq = writev_send(state, state->ev, state->cli->outgoing,
+                                    state->cli->fd, iov, 1);
+       } else {
+               subreq = writev_send(state, state->ev, state->cli->outgoing,
+                                    state->cli->fd, iov, iov_count);
        }
+       if (subreq == NULL) {
+               return false;
+       }
+       tevent_req_set_callback(subreq, cli_smb_sent, req);
+       return true;
+}
+
+bool cli_smb_req_send(struct tevent_req *req)
+{
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
 
-       req->sent = 0;
+       if (state->cli->fd == -1) {
+               return false;
+       }
 
-       event_fd_set_writeable(cli->fd_event);
+       return cli_smb_req_iov_send(req, state, state->iov, state->iov_count);
 }
 
-/**
- * @brief Send a request to the server
- * @param[in] mem_ctx          The TALLOC_CTX for the result
- * @param[in] ev               The event context that will call us back
- * @param[in] cli              The cli_state we queue the request up for
- * @param[in] smb_command      The command that we want to issue
- * @param[in] additional_flags open_and_x wants to add oplock header flags
- * @param[in] wct              How many words?
- * @param[in] vwv              The words, already in network order
- * @param[in] num_bytes                How many bytes?
- * @param[in] bytes            The data the request ships
- *
- * This is the generic routine to be used by the cli_xxx_send routines.
- */
+struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx,
+                               struct event_context *ev,
+                               struct cli_state *cli,
+                               uint8_t smb_command,
+                               uint8_t additional_flags,
+                               uint8_t wct, uint16_t *vwv,
+                               uint32_t num_bytes,
+                               const uint8_t *bytes)
+{
+       struct tevent_req *req;
+       struct iovec iov;
+
+       iov.iov_base = CONST_DISCARD(char *, bytes);
+       iov.iov_len = num_bytes;
 
-struct async_req *cli_request_send(TALLOC_CTX *mem_ctx,
-                                  struct event_context *ev,
-                                  struct cli_state *cli,
-                                  uint8_t smb_command,
-                                  uint8_t additional_flags,
-                                  uint8_t wct, const uint16_t *vwv,
-                                  uint16_t num_bytes, const uint8_t *bytes)
+       req = cli_smb_req_create(mem_ctx, ev, cli, smb_command,
+                                additional_flags, wct, vwv, 1, &iov);
+       if (req == NULL) {
+               return NULL;
+       }
+       if (!cli_smb_req_send(req)) {
+               TALLOC_FREE(req);
+       }
+       return req;
+}
+
+static void cli_smb_sent(struct tevent_req *subreq)
 {
-       struct async_req *result;
-       bool uncork = false;
-
-       if (cli->chain_accumulator == NULL) {
-               if (!cli_chain_cork(cli, ev,
-                                   wct * sizeof(uint16_t) + num_bytes + 3)) {
-                       DEBUG(1, ("cli_chain_cork failed\n"));
-                       return NULL;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
+       ssize_t nwritten;
+       int err;
+
+       nwritten = writev_recv(subreq, &err);
+       TALLOC_FREE(subreq);
+       if (nwritten == -1) {
+               tevent_req_nterror(req, map_nt_error_from_unix(err));
+               return;
+       }
+
+       switch (CVAL(state->header, smb_com)) {
+       case SMBtranss:
+       case SMBtranss2:
+       case SMBnttranss:
+       case SMBntcancel:
+               state->inbuf = NULL;
+               tevent_req_done(req);
+               return;
+       case SMBlockingX:
+               if ((CVAL(state->header, smb_wct) == 8) &&
+                   (CVAL(state->vwv+3, 0) == LOCKING_ANDX_OPLOCK_RELEASE)) {
+                       state->inbuf = NULL;
+                       tevent_req_done(req);
+                       return;
                }
-               uncork = true;
        }
 
-       result = cli_request_chain(mem_ctx, ev, cli, smb_command,
-                                  additional_flags, wct, vwv,
-                                  num_bytes, bytes);
+       if (!cli_smb_req_set_pending(req)) {
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
+}
 
-       if (result == NULL) {
-               DEBUG(1, ("cli_request_chain failed\n"));
+static void cli_smb_received(struct tevent_req *subreq)
+{
+       struct cli_state *cli = tevent_req_callback_data(
+               subreq, struct cli_state);
+       struct tevent_req *req;
+       struct cli_smb_state *state;
+       struct tevent_context *ev;
+       NTSTATUS status;
+       uint8_t *inbuf;
+       ssize_t received;
+       int num_pending;
+       int i, err;
+       uint16_t mid;
+       bool oplock_break;
+
+       received = read_smb_recv(subreq, talloc_tos(), &inbuf, &err);
+       TALLOC_FREE(subreq);
+       if (received == -1) {
+               status = map_nt_error_from_unix(err);
+               goto fail;
        }
 
-       if (uncork) {
-               cli_chain_uncork(cli);
+       if ((IVAL(inbuf, 4) != 0x424d53ff) /* 0xFF"SMB" */
+           && (SVAL(inbuf, 4) != 0x45ff)) /* 0xFF"E" */ {
+               DEBUG(10, ("Got non-SMB PDU\n"));
+               status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+               goto fail;
        }
 
-       return result;
-}
+       if (cli_encryption_on(cli) && (CVAL(inbuf, 0) == 0)) {
+               uint16_t enc_ctx_num;
 
-/**
- * Figure out if there is an andx command behind the current one
- * @param[in] buf      The smb buffer to look at
- * @param[in] ofs      The offset to the wct field that is followed by the cmd
- * @retval Is there a command following?
- */
+               status = get_enc_ctx_num(inbuf, &enc_ctx_num);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(10, ("get_enc_ctx_num returned %s\n",
+                                  nt_errstr(status)));
+                       goto fail;
+               }
 
-static bool have_andx_command(const char *buf, uint16_t ofs)
-{
-       uint8_t wct;
-       size_t buflen = talloc_get_size(buf);
+               if (enc_ctx_num != cli->trans_enc_state->enc_ctx_num) {
+                       DEBUG(10, ("wrong enc_ctx %d, expected %d\n",
+                                  enc_ctx_num,
+                                  cli->trans_enc_state->enc_ctx_num));
+                       status = NT_STATUS_INVALID_HANDLE;
+                       goto fail;
+               }
 
-       if ((ofs == buflen-1) || (ofs == buflen)) {
-               return false;
+               status = common_decrypt_buffer(cli->trans_enc_state,
+                                              (char *)inbuf);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(10, ("common_decrypt_buffer returned %s\n",
+                                  nt_errstr(status)));
+                       goto fail;
+               }
        }
 
-       wct = CVAL(buf, ofs);
-       if (wct < 2) {
+       mid = SVAL(inbuf, smb_mid);
+       num_pending = talloc_array_length(cli->pending);
+
+       for (i=0; i<num_pending; i++) {
+               if (mid == cli_smb_req_mid(cli->pending[i])) {
+                       break;
+               }
+       }
+       if (i == num_pending) {
+               /* Dump unexpected reply */
+               TALLOC_FREE(inbuf);
+               goto done;
+       }
+
+       oplock_break = false;
+
+       if (mid == 0xffff) {
                /*
-                * Not enough space for the command and a following pointer
+                * Paranoia checks that this is really an oplock break request.
                 */
-               return false;
+               oplock_break = (smb_len(inbuf) == 51); /* hdr + 8 words */
+               oplock_break &= ((CVAL(inbuf, smb_flg) & FLAG_REPLY) == 0);
+               oplock_break &= (CVAL(inbuf, smb_com) == SMBlockingX);
+               oplock_break &= (SVAL(inbuf, smb_vwv6) == 0);
+               oplock_break &= (SVAL(inbuf, smb_vwv7) == 0);
+
+               if (!oplock_break) {
+                       /* Dump unexpected reply */
+                       TALLOC_FREE(inbuf);
+                       goto done;
+               }
        }
-       return (CVAL(buf, ofs+1) != 0xff);
-}
 
-/**
- * @brief Pull reply data out of a request
- * @param[in] req              The request that we just received a reply for
- * @param[out] pwct            How many words did the server send?
- * @param[out] pvwv            The words themselves
- * @param[out] pnum_bytes      How many bytes did the server send?
- * @param[out] pbytes          The bytes themselves
- * @retval Was the reply formally correct?
- */
+       req = cli->pending[i];
+       state = tevent_req_data(req, struct cli_smb_state);
+       ev = state->ev;
 
-NTSTATUS cli_pull_reply(struct async_req *req,
-                       uint8_t *pwct, uint16_t **pvwv,
-                       uint16_t *pnum_bytes, uint8_t **pbytes)
-{
-       struct cli_request *cli_req = talloc_get_type_abort(
-               req->private_data, struct cli_request);
-       uint8_t wct, cmd;
-       uint16_t num_bytes;
-       size_t wct_ofs, bytes_offset;
-       int i, j;
-       NTSTATUS status;
+       if (!oplock_break /* oplock breaks are not signed */
+           && !cli_check_sign_mac(cli, (char *)inbuf, state->seqnum+1)) {
+               DEBUG(10, ("cli_check_sign_mac failed\n"));
+               TALLOC_FREE(inbuf);
+               status = NT_STATUS_ACCESS_DENIED;
+               goto fail;
+       }
 
-       for (i = 0; i < cli_req->num_async; i++) {
-               if (req == cli_req->async[i]) {
-                       break;
+       if (state->chained_requests == NULL) {
+               state->inbuf = talloc_move(state, &inbuf);
+               talloc_set_destructor(req, NULL);
+               cli_smb_req_destructor(req);
+               tevent_req_done(req);
+       } else {
+               struct tevent_req **chain = talloc_move(
+                       talloc_tos(), &state->chained_requests);
+               int num_chained = talloc_array_length(chain);
+
+               for (i=0; i<num_chained; i++) {
+                       state = tevent_req_data(chain[i], struct
+                                               cli_smb_state);
+                       state->inbuf = inbuf;
+                       state->chain_num = i;
+                       tevent_req_done(chain[i]);
                }
+               TALLOC_FREE(inbuf);
+               TALLOC_FREE(chain);
        }
-
-       if (i == cli_req->num_async) {
-               cli_set_error(cli_req->cli, NT_STATUS_INVALID_PARAMETER);
-               return NT_STATUS_INVALID_PARAMETER;
+ done:
+       if (talloc_array_length(cli->pending) > 0) {
+               /*
+                * Set up another read request for the other pending cli_smb
+                * requests
+                */
+               state = tevent_req_data(cli->pending[0], struct cli_smb_state);
+               subreq = read_smb_send(cli->pending, state->ev, cli->fd);
+               if (subreq == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto fail;
+               }
+               tevent_req_set_callback(subreq, cli_smb_received, cli);
        }
-
-       /**
-        * The status we pull here is only relevant for the last reply in the
-        * chain.
+       return;
+ fail:
+       /*
+        * Cancel all pending requests. We don't do a for-loop walking
+        * cli->pending because that array changes in
+        * cli_smb_req_destructor().
         */
+       while (talloc_array_length(cli->pending) > 0) {
+               req = cli->pending[0];
+               talloc_set_destructor(req, NULL);
+               cli_smb_req_destructor(req);
+               tevent_req_nterror(req, status);
+       }
+}
 
-       status = cli_pull_error(cli_req->inbuf);
+NTSTATUS cli_smb_recv(struct tevent_req *req, uint8_t min_wct,
+                     uint8_t *pwct, uint16_t **pvwv,
+                     uint32_t *pnum_bytes, uint8_t **pbytes)
+{
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
+       NTSTATUS status = NT_STATUS_OK;
+       uint8_t cmd, wct;
+       uint16_t num_bytes;
+       size_t wct_ofs, bytes_offset;
+       int i;
 
-       if (i == 0) {
-               if (NT_STATUS_IS_ERR(status)
-                   && !have_andx_command(cli_req->inbuf, smb_wct)) {
-                       cli_set_error(cli_req->cli, status);
-                       return status;
-               }
-               wct_ofs = smb_wct;
-               goto done;
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+
+       if (state->inbuf == NULL) {
+               /* This was a request without a reply */
+               return NT_STATUS_OK;
        }
 
-       cmd = CVAL(cli_req->inbuf, smb_com);
        wct_ofs = smb_wct;
+       cmd = CVAL(state->inbuf, smb_com);
 
-       for (j = 0; j < i; j++) {
-               if (j < i-1) {
+       for (i=0; i<state->chain_num; i++) {
+               if (i < state->chain_num-1) {
                        if (cmd == 0xff) {
                                return NT_STATUS_REQUEST_ABORTED;
                        }
@@ -699,7 +860,7 @@ NTSTATUS cli_pull_reply(struct async_req *req,
                        }
                }
 
-               if (!have_andx_command(cli_req->inbuf, wct_ofs)) {
+               if (!have_andx_command((char *)state->inbuf, wct_ofs)) {
                        /*
                         * This request was not completed because a previous
                         * request in the chain had received an error.
@@ -707,7 +868,7 @@ NTSTATUS cli_pull_reply(struct async_req *req,
                        return NT_STATUS_REQUEST_ABORTED;
                }
 
-               wct_ofs = SVAL(cli_req->inbuf, wct_ofs + 3);
+               wct_ofs = SVAL(state->inbuf, wct_ofs + 3);
 
                /*
                 * Skip the all-present length field. No overflow, we've just
@@ -715,14 +876,16 @@ NTSTATUS cli_pull_reply(struct async_req *req,
                 */
                wct_ofs += 4;
 
-               if (wct_ofs+2 > talloc_get_size(cli_req->inbuf)) {
+               if (wct_ofs+2 > talloc_get_size(state->inbuf)) {
                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
                }
 
-               cmd = CVAL(cli_req->inbuf, wct_ofs + 1);
+               cmd = CVAL(state->inbuf, wct_ofs + 1);
        }
 
-       if (!have_andx_command(cli_req->inbuf, wct_ofs)
+       status = cli_pull_error((char *)state->inbuf);
+
+       if (!have_andx_command((char *)state->inbuf, wct_ofs)
            && NT_STATUS_IS_ERR(status)) {
                /*
                 * The last command takes the error code. All further commands
@@ -732,336 +895,241 @@ NTSTATUS cli_pull_reply(struct async_req *req,
                return status;
        }
 
- done:
-       wct = CVAL(cli_req->inbuf, wct_ofs);
-
+       wct = CVAL(state->inbuf, wct_ofs);
        bytes_offset = wct_ofs + 1 + wct * sizeof(uint16_t);
-       num_bytes = SVAL(cli_req->inbuf, bytes_offset);
+       num_bytes = SVAL(state->inbuf, bytes_offset);
+
+       if (wct < min_wct) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
 
        /*
         * wct_ofs is a 16-bit value plus 4, wct is a 8-bit value, num_bytes
         * is a 16-bit value. So bytes_offset being size_t should be far from
         * wrapping.
         */
-
-       if ((bytes_offset + 2 > talloc_get_size(cli_req->inbuf))
+       if ((bytes_offset + 2 > talloc_get_size(state->inbuf))
            || (bytes_offset > 0xffff)) {
                return NT_STATUS_INVALID_NETWORK_RESPONSE;
        }
 
-       *pwct = wct;
-       *pvwv = (uint16_t *)(cli_req->inbuf + wct_ofs + 1);
-       *pnum_bytes = num_bytes;
-       *pbytes = (uint8_t *)cli_req->inbuf + bytes_offset + 2;
+       if (pwct != NULL) {
+               *pwct = wct;
+       }
+       if (pvwv != NULL) {
+               *pvwv = (uint16_t *)(state->inbuf + wct_ofs + 1);
+       }
+       if (pnum_bytes != NULL) {
+               *pnum_bytes = num_bytes;
+       }
+       if (pbytes != NULL) {
+               *pbytes = (uint8_t *)state->inbuf + bytes_offset + 2;
+       }
 
        return NT_STATUS_OK;
 }
 
-/**
- * Decrypt a PDU, check the signature
- * @param[in] cli      The cli_state that received something
- * @param[in] pdu      The incoming bytes
- * @retval error code
- */
-
-
-static NTSTATUS validate_smb_crypto(struct cli_state *cli, char *pdu)
+size_t cli_smb_wct_ofs(struct tevent_req **reqs, int num_reqs)
 {
-       NTSTATUS status;
-
-       if ((IVAL(pdu, 4) != 0x424d53ff) /* 0xFF"SMB" */
-           && (SVAL(pdu, 4) != 0x45ff)) /* 0xFF"E" */ {
-               DEBUG(10, ("Got non-SMB PDU\n"));
-               return NT_STATUS_INVALID_NETWORK_RESPONSE;
-       }
-
-       if (cli_encryption_on(cli) && CVAL(pdu, 0) == 0) {
-               uint16_t enc_ctx_num;
-
-               status = get_enc_ctx_num((uint8_t *)pdu, &enc_ctx_num);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(10, ("get_enc_ctx_num returned %s\n",
-                                  nt_errstr(status)));
-                       return status;
-               }
+       size_t wct_ofs;
+       int i;
 
-               if (enc_ctx_num != cli->trans_enc_state->enc_ctx_num) {
-                       DEBUG(10, ("wrong enc_ctx %d, expected %d\n",
-                                  enc_ctx_num,
-                                  cli->trans_enc_state->enc_ctx_num));
-                       return NT_STATUS_INVALID_HANDLE;
-               }
+       wct_ofs = smb_wct - 4;
 
-               status = common_decrypt_buffer(cli->trans_enc_state, pdu);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(10, ("common_decrypt_buffer returned %s\n",
-                                  nt_errstr(status)));
-                       return status;
-               }
+       for (i=0; i<num_reqs; i++) {
+               struct cli_smb_state *state;
+               state = tevent_req_data(reqs[i], struct cli_smb_state);
+               wct_ofs += iov_len(state->iov+1, state->iov_count-1);
+               wct_ofs = (wct_ofs + 3) & ~3;
        }
-
-       if (!cli_check_sign_mac(cli, pdu)) {
-               DEBUG(10, ("cli_check_sign_mac failed\n"));
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       return NT_STATUS_OK;
+       return wct_ofs;
 }
 
-/**
- * A PDU has arrived on cli->evt_inbuf
- * @param[in] cli      The cli_state that received something
- */
-
-static void handle_incoming_pdu(struct cli_state *cli)
+bool cli_smb_chain_send(struct tevent_req **reqs, int num_reqs)
 {
-       struct cli_request *req;
-       uint16_t mid;
-       size_t raw_pdu_len, buf_len, pdu_len, rest_len;
-       char *pdu;
-       int i;
-       NTSTATUS status;
-
-       int num_async;
+       struct cli_smb_state *first_state = tevent_req_data(
+               reqs[0], struct cli_smb_state);
+       struct cli_smb_state *last_state = tevent_req_data(
+               reqs[num_reqs-1], struct cli_smb_state);
+       struct cli_smb_state *state;
+       size_t wct_offset;
+       size_t chain_padding = 0;
+       int i, iovlen;
+       struct iovec *iov = NULL;
+       struct iovec *this_iov;
+
+       iovlen = 0;
+       for (i=0; i<num_reqs; i++) {
+               state = tevent_req_data(reqs[i], struct cli_smb_state);
+               iovlen += state->iov_count;
+       }
 
-       /*
-        * The encrypted PDU len might differ from the unencrypted one
-        */
-       raw_pdu_len = smb_len(cli->evt_inbuf) + 4;
-       buf_len = talloc_get_size(cli->evt_inbuf);
-       rest_len = buf_len - raw_pdu_len;
+       iov = talloc_array(last_state, struct iovec, iovlen);
+       if (iov == NULL) {
+               goto fail;
+       }
 
-       if (buf_len == raw_pdu_len) {
-               /*
-                * Optimal case: Exactly one PDU was in the socket buffer
-                */
-               pdu = cli->evt_inbuf;
-               cli->evt_inbuf = NULL;
+       first_state->chained_requests = (struct tevent_req **)talloc_memdup(
+               last_state, reqs, sizeof(*reqs) * num_reqs);
+       if (first_state->chained_requests == NULL) {
+               goto fail;
        }
-       else {
-               DEBUG(11, ("buf_len = %d, raw_pdu_len = %d, splitting "
-                          "buffer\n", (int)buf_len, (int)raw_pdu_len));
 
-               if (raw_pdu_len < rest_len) {
-                       /*
-                        * The PDU is shorter, talloc_memdup that one.
-                        */
-                       pdu = (char *)talloc_memdup(
-                               cli, cli->evt_inbuf, raw_pdu_len);
+       wct_offset = smb_wct - 4;
+       this_iov = iov;
 
-                       memmove(cli->evt_inbuf, cli->evt_inbuf + raw_pdu_len,
-                               buf_len - raw_pdu_len);
+       for (i=0; i<num_reqs; i++) {
+               size_t next_padding = 0;
+               uint16_t *vwv;
 
-                       cli->evt_inbuf = TALLOC_REALLOC_ARRAY(
-                               NULL, cli->evt_inbuf, char, rest_len);
+               state = tevent_req_data(reqs[i], struct cli_smb_state);
 
-                       if (pdu == NULL) {
-                               status = NT_STATUS_NO_MEMORY;
-                               goto invalidate_requests;
+               if (i < num_reqs-1) {
+                       if (!is_andx_req(CVAL(state->header, smb_com))
+                           || CVAL(state->header, smb_wct) < 2) {
+                               goto fail;
                        }
                }
-               else {
-                       /*
-                        * The PDU is larger than the rest, talloc_memdup the
-                        * rest
-                        */
-                       pdu = cli->evt_inbuf;
 
-                       cli->evt_inbuf = (char *)talloc_memdup(
-                               cli, pdu + raw_pdu_len, rest_len);
+               wct_offset += iov_len(state->iov+1, state->iov_count-1) + 1;
+               if ((wct_offset % 4) != 0) {
+                       next_padding = 4 - (wct_offset % 4);
+               }
+               wct_offset += next_padding;
+               vwv = state->vwv;
+
+               if (i < num_reqs-1) {
+                       struct cli_smb_state *next_state = tevent_req_data(
+                               reqs[i+1], struct cli_smb_state);
+                       SCVAL(vwv+0, 0, CVAL(next_state->header, smb_com));
+                       SCVAL(vwv+0, 1, 0);
+                       SSVAL(vwv+1, 0, wct_offset);
+               } else if (is_andx_req(CVAL(state->header, smb_com))) {
+                       /* properly end the chain */
+                       SCVAL(vwv+0, 0, 0xff);
+                       SCVAL(vwv+0, 1, 0xff);
+                       SSVAL(vwv+1, 0, 0);
+               }
 
-                       if (cli->evt_inbuf == NULL) {
-                               status = NT_STATUS_NO_MEMORY;
-                               goto invalidate_requests;
-                       }
+               if (i == 0) {
+                       this_iov[0] = state->iov[0];
+               } else {
+                       /*
+                        * This one is a bit subtle. We have to add
+                        * chain_padding bytes between the requests, and we
+                        * have to also include the wct field of the
+                        * subsequent requests. We use the subsequent header
+                        * for the padding, it contains the wct field in its
+                        * last byte.
+                        */
+                       this_iov[0].iov_len = chain_padding+1;
+                       this_iov[0].iov_base = &state->header[
+                               sizeof(state->header) - this_iov[0].iov_len];
+                       memset(this_iov[0].iov_base, 0, this_iov[0].iov_len-1);
                }
+               memcpy(this_iov+1, state->iov+1,
+                      sizeof(struct iovec) * (state->iov_count-1));
+               this_iov += state->iov_count;
+               chain_padding = next_padding;
        }
 
-       status = validate_smb_crypto(cli, pdu);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto invalidate_requests;
+       if (!cli_smb_req_iov_send(reqs[0], last_state, iov, iovlen)) {
+               goto fail;
        }
+       return true;
+ fail:
+       TALLOC_FREE(iov);
+       return false;
+}
 
-       mid = SVAL(pdu, smb_mid);
+uint8_t *cli_smb_inbuf(struct tevent_req *req)
+{
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
+       return state->inbuf;
+}
 
-       DEBUG(10, ("handle_incoming_pdu: got mid %d\n", mid));
+bool cli_has_async_calls(struct cli_state *cli)
+{
+       return ((tevent_queue_length(cli->outgoing) != 0)
+               || (talloc_array_length(cli->pending) != 0));
+}
 
-       for (req = cli->outstanding_requests; req; req = req->next) {
-               if (req->mid == mid) {
-                       break;
-               }
-       }
+struct cli_smb_oplock_break_waiter_state {
+       uint16_t fnum;
+       uint8_t level;
+};
 
-       pdu_len = smb_len(pdu) + 4;
+static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq);
 
-       if (req == NULL) {
-               DEBUG(3, ("Request for mid %d not found, dumping PDU\n", mid));
+struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
+                                                   struct event_context *ev,
+                                                   struct cli_state *cli)
+{
+       struct tevent_req *req, *subreq;
+       struct cli_smb_oplock_break_waiter_state *state;
+       struct cli_smb_state *smb_state;
 
-               TALLOC_FREE(pdu);
-               return;
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_smb_oplock_break_waiter_state);
+       if (req == NULL) {
+               return NULL;
        }
 
-       req->inbuf = talloc_move(req, &pdu);
-
        /*
-        * Freeing the last async_req will free the req (see
-        * cli_async_req_destructor). So make a copy of req->num_async, we
-        * can't reference it in the last round.
+        * Create a fake SMB request that we will never send out. This is only
+        * used to be set into the pending queue with the right mid.
         */
-
-       num_async = req->num_async;
-
-       for (i=0; i<num_async; i++) {
-               /**
-                * A request might have been talloc_free()'ed before we arrive
-                * here. It will have removed itself from req->async via its
-                * destructor cli_async_req_destructor().
-                */
-               if (req->async[i] != NULL) {
-                       if (req->recv_helper.fn != NULL) {
-                               req->recv_helper.fn(req->async[i]);
-                       } else {
-                               async_req_done(req->async[i]);
-                       }
-               }
+       subreq = cli_smb_req_create(mem_ctx, ev, cli, 0, 0, 0, NULL, 0, NULL);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
        }
-       return;
+       smb_state = tevent_req_data(subreq, struct cli_smb_state);
+       SSVAL(smb_state->header, smb_mid, 0xffff);
 
- invalidate_requests:
-
-       DEBUG(10, ("handle_incoming_pdu: Aborting with %s\n",
-                  nt_errstr(status)));
-
-       for (req = cli->outstanding_requests; req; req = req->next) {
-               async_req_error(req->async[0], status);
+       if (!cli_smb_req_set_pending(subreq)) {
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+               return tevent_req_post(req, ev);
        }
-       return;
+       tevent_req_set_callback(subreq, cli_smb_oplock_break_waiter_done, req);
+       return req;
 }
 
-/**
- * fd event callback. This is the basic connection to the socket
- * @param[in] event_ctx        The event context that called us
- * @param[in] event    The event that fired
- * @param[in] flags    EVENT_FD_READ | EVENT_FD_WRITE
- * @param[in] p                private_data, in this case the cli_state
- */
-
-static void cli_state_handler(struct event_context *event_ctx,
-                             struct fd_event *event, uint16 flags, void *p)
+static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq)
 {
-       struct cli_state *cli = (struct cli_state *)p;
-       struct cli_request *req;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
+               req, struct cli_smb_oplock_break_waiter_state);
+       uint8_t wct;
+       uint16_t *vwv;
+       uint32_t num_bytes;
+       uint8_t *bytes;
        NTSTATUS status;
 
-       DEBUG(11, ("cli_state_handler called with flags %d\n", flags));
-
-       if (flags & EVENT_FD_READ) {
-               int res, available;
-               size_t old_size, new_size;
-               char *tmp;
-
-               res = ioctl(cli->fd, FIONREAD, &available);
-               if (res == -1) {
-                       DEBUG(10, ("ioctl(FIONREAD) failed: %s\n",
-                                  strerror(errno)));
-                       status = map_nt_error_from_unix(errno);
-                       goto sock_error;
-               }
-
-               if (available == 0) {
-                       /* EOF */
-                       status = NT_STATUS_END_OF_FILE;
-                       goto sock_error;
-               }
-
-               old_size = talloc_get_size(cli->evt_inbuf);
-               new_size = old_size + available;
-
-               if (new_size < old_size) {
-                       /* wrap */
-                       status = NT_STATUS_UNEXPECTED_IO_ERROR;
-                       goto sock_error;
-               }
-
-               tmp = TALLOC_REALLOC_ARRAY(cli, cli->evt_inbuf, char,
-                                          new_size);
-               if (tmp == NULL) {
-                       /* nomem */
-                       status = NT_STATUS_NO_MEMORY;
-                       goto sock_error;
-               }
-               cli->evt_inbuf = tmp;
-
-               res = sys_recv(cli->fd, cli->evt_inbuf + old_size, available, 0);
-               if (res == -1) {
-                       DEBUG(10, ("recv failed: %s\n", strerror(errno)));
-                       status = map_nt_error_from_unix(errno);
-                       goto sock_error;
-               }
-
-               DEBUG(11, ("cli_state_handler: received %d bytes, "
-                          "smb_len(evt_inbuf) = %d\n", (int)res,
-                          smb_len(cli->evt_inbuf)));
-
-               /* recv *might* have returned less than announced */
-               new_size = old_size + res;
-
-               /* shrink, so I don't expect errors here */
-               cli->evt_inbuf = TALLOC_REALLOC_ARRAY(cli, cli->evt_inbuf,
-                                                     char, new_size);
-
-               while ((cli->evt_inbuf != NULL)
-                      && ((smb_len(cli->evt_inbuf) + 4) <= new_size)) {
-                       /*
-                        * we've got a complete NBT level PDU in evt_inbuf
-                        */
-                       handle_incoming_pdu(cli);
-                       new_size = talloc_get_size(cli->evt_inbuf);
-               }
+       status = cli_smb_recv(subreq, 8, &wct, &vwv, &num_bytes, &bytes);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(subreq);
+               tevent_req_nterror(req, status);
+               return;
        }
+       state->fnum = SVAL(vwv+2, 0);
+       state->level = CVAL(vwv+3, 1);
+       tevent_req_done(req);
+}
 
-       if (flags & EVENT_FD_WRITE) {
-               size_t to_send;
-               ssize_t sent;
-
-               for (req = cli->outstanding_requests; req; req = req->next) {
-                       to_send = smb_len(req->outbuf)+4;
-                       if (to_send > req->sent) {
-                               break;
-                       }
-               }
-
-               if (req == NULL) {
-                       if (cli->fd_event != NULL) {
-                               event_fd_set_not_writeable(cli->fd_event);
-                       }
-                       return;
-               }
-
-               sent = sys_send(cli->fd, req->outbuf + req->sent,
-                           to_send - req->sent, 0);
-
-               if (sent < 0) {
-                       status = map_nt_error_from_unix(errno);
-                       goto sock_error;
-               }
-
-               req->sent += sent;
-
-               if (req->sent == to_send) {
-                       return;
-               }
-       }
-       return;
+NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
+                                         uint16_t *pfnum,
+                                         uint8_t *plevel)
+{
+       struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
+               req, struct cli_smb_oplock_break_waiter_state);
+       NTSTATUS status;
 
- sock_error:
-       for (req = cli->outstanding_requests; req; req = req->next) {
-               int i;
-               for (i=0; i<req->num_async; i++) {
-                       async_req_error(req->async[i], status);
-               }
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
        }
-       TALLOC_FREE(cli->fd_event);
-       close(cli->fd);
-       cli->fd = -1;
+       *pfnum = state->fnum;
+       *plevel = state->level;
+       return NT_STATUS_OK;
 }