s3:async_smb: remove unused variable
[ira/wip.git] / source3 / libsmb / async_smb.c
index 04c22a9d17c9a7730e4a42dd775c378cf6a940b6..0667fa3ab2e50ab9172168f8ecc837094d7f7b66 100644 (file)
 #include "includes.h"
 
 /*
+ * Read an smb packet asynchronously, discard keepalives
+ */
+
+struct read_smb_state {
+       struct tevent_context *ev;
+       int fd;
+       uint8_t *buf;
+};
+
+static ssize_t read_smb_more(uint8_t *buf, size_t buflen, void *private_data);
+static void read_smb_done(struct tevent_req *subreq);
+
+static struct tevent_req *read_smb_send(TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       int fd)
+{
+       struct tevent_req *result, *subreq;
+       struct read_smb_state *state;
+
+       result = tevent_req_create(mem_ctx, &state, struct read_smb_state);
+       if (result == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->fd = fd;
+
+       subreq = read_packet_send(state, ev, fd, 4, read_smb_more, NULL);
+       if (subreq == NULL) {
+               goto fail;
+       }
+       tevent_req_set_callback(subreq, read_smb_done, result);
+       return result;
+ fail:
+       TALLOC_FREE(result);
+       return NULL;
+}
+
+static ssize_t read_smb_more(uint8_t *buf, size_t buflen, void *private_data)
+{
+       if (buflen > 4) {
+               return 0;       /* We've been here, we're done */
+       }
+       return smb_len_large(buf);
+}
+
+static void read_smb_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct read_smb_state *state = tevent_req_data(
+               req, struct read_smb_state);
+       ssize_t len;
+       int err;
+
+       len = read_packet_recv(subreq, state, &state->buf, &err);
+       TALLOC_FREE(subreq);
+       if (len == -1) {
+               tevent_req_error(req, err);
+               return;
+       }
+
+       if (CVAL(state->buf, 0) == SMBkeepalive) {
+               subreq = read_packet_send(state, state->ev, state->fd, 4,
+                                         read_smb_more, NULL);
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
+               }
+               tevent_req_set_callback(subreq, read_smb_done, req);
+               return;
+       }
+       tevent_req_done(req);
+}
+
+static ssize_t read_smb_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                            uint8_t **pbuf, int *perrno)
+{
+       struct read_smb_state *state = tevent_req_data(
+               req, struct read_smb_state);
+
+       if (tevent_req_is_unix_error(req, perrno)) {
+               return -1;
+       }
+       *pbuf = talloc_move(mem_ctx, &state->buf);
+       return talloc_get_size(*pbuf);
+}
+
+/**
  * Fetch an error out of a NBT packet
+ * @param[in] buf      The SMB packet
+ * @retval             The error, converted to NTSTATUS
  */
 
 NTSTATUS cli_pull_error(char *buf)
@@ -31,11 +120,19 @@ NTSTATUS cli_pull_error(char *buf)
                return NT_STATUS(IVAL(buf, smb_rcls));
        }
 
+       /* if the client uses dos errors, but there is no error,
+          we should return no error here, otherwise it looks
+          like an unknown bad NT_STATUS. jmcd */
+       if (CVAL(buf, smb_rcls) == 0)
+               return NT_STATUS_OK;
+
        return NT_STATUS_DOS(CVAL(buf, smb_rcls), SVAL(buf,smb_err));
 }
 
-/*
+/**
  * Compatibility helper for the sync APIs: Fake NTSTATUS in cli->inbuf
+ * @param[in] cli      The client connection that just received an error
+ * @param[in] status   The error to set on "cli"
  */
 
 void cli_set_error(struct cli_state *cli, NTSTATUS status)
@@ -55,195 +152,496 @@ void cli_set_error(struct cli_state *cli, NTSTATUS status)
        return;
 }
 
-/*
- * Allocate a new mid
+/**
+ * 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 uint16_t cli_new_mid(struct cli_state *cli)
+static bool have_andx_command(const char *buf, uint16_t ofs)
+{
+       uint8_t wct;
+       size_t buflen = talloc_get_size(buf);
+
+       if ((ofs == buflen-1) || (ofs == buflen)) {
+               return false;
+       }
+
+       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);
+}
+
+#define MAX_SMB_IOV 5
+
+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 */
+
+       /*
+        * 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;
+
+       uint16_t *vwv;
+       uint8_t bytecount_buf[2];
+
+       struct iovec iov[MAX_SMB_IOV+3];
+       int iov_count;
+
+       uint8_t *inbuf;
+       uint32_t seqnum;
+       int chain_num;
+       struct tevent_req **chained_requests;
+};
+
+static uint16_t cli_alloc_mid(struct cli_state *cli)
 {
+       int num_pending = talloc_array_length(cli->pending);
        uint16_t result;
-       struct cli_request *req;
 
        while (true) {
+               int i;
+
                result = cli->mid++;
-               if (result == 0) {
+               if ((result == 0) || (result == 0xffff)) {
                        continue;
                }
 
-               for (req = cli->outstanding_requests; req; req = req->next) {
-                       if (result == req->mid) {
+               for (i=0; i<num_pending; i++) {
+                       if (result == cli_smb_req_mid(cli->pending[i])) {
                                break;
                        }
                }
 
-               if (req == NULL) {
+               if (i == num_pending) {
                        return result;
                }
        }
 }
 
-static char *cli_request_print(TALLOC_CTX *mem_ctx, struct async_req *req)
+void cli_smb_req_unset_pending(struct tevent_req *req)
 {
-       char *result = async_req_print(mem_ctx, req);
-       struct cli_request *cli_req = cli_request_get(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 (result == NULL) {
-               return NULL;
+       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;
        }
 
-       return talloc_asprintf_append_buffer(
-               result, "mid=%d\n", cli_req->mid);
+       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;
+       }
+
+       /*
+        * Remove ourselves from the cli->pending array
+        */
+       if (num_pending > 1) {
+               cli->pending[i] = cli->pending[num_pending-1];
+       }
+
+       /*
+        * 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;
 }
 
-static int cli_request_destructor(struct cli_request *req)
+static int cli_smb_req_destructor(struct tevent_req *req)
 {
-       if (req->enc_state != NULL) {
-               common_free_enc_buffer(req->enc_state, req->outbuf);
-       }
-       DLIST_REMOVE(req->cli->outstanding_requests, req);
+       cli_smb_req_unset_pending(req);
        return 0;
 }
 
+static void cli_smb_received(struct tevent_req *subreq);
+
+bool cli_smb_req_set_pending(struct tevent_req *req)
+{
+       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);
+
+       if (num_pending > 0) {
+               return true;
+       }
+
+       /*
+        * 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;
+}
+
 /*
- * Create a fresh async smb request
+ * 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);
+}
 
-struct async_req *cli_request_new(TALLOC_CTX *mem_ctx,
-                                 struct event_context *ev,
-                                 struct cli_state *cli,
-                                 uint8_t num_words, size_t num_bytes,
-                                 struct cli_request **preq)
+void cli_smb_req_set_mid(struct tevent_req *req, uint16_t mid)
 {
-       struct async_req *result;
-       struct cli_request *cli_req;
-       size_t bufsize = smb_size + num_words * 2 + num_bytes;
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
+       state->mid = mid;
+}
 
-       result = async_req_new(mem_ctx, ev);
-       if (result == NULL) {
+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;
+}
+
+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;
+       struct timeval endtime;
 
-       cli_req = (struct cli_request *)talloc_size(
-               result, sizeof(*cli_req) + bufsize);
-       if (cli_req == NULL) {
-               TALLOC_FREE(result);
+       if (iov_count > MAX_SMB_IOV) {
+               /*
+                * Should not happen :-)
+                */
                return NULL;
        }
-       talloc_set_name_const(cli_req, "struct cli_request");
-       result->private_data = cli_req;
-       result->print = cli_request_print;
 
-       cli_req->async = result;
-       cli_req->cli = cli;
-       cli_req->outbuf = ((char *)cli_req + sizeof(*cli_req));
-       cli_req->sent = 0;
-       cli_req->mid = cli_new_mid(cli);
-       cli_req->inbuf = NULL;
-       cli_req->enc_state = NULL;
+       result = tevent_req_create(mem_ctx, &state, struct cli_smb_state);
+       if (result == NULL) {
+               return NULL;
+       }
+       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);
 
-       SCVAL(cli_req->outbuf, smb_wct, num_words);
-       SSVAL(cli_req->outbuf, smb_vwv + num_words * 2, num_bytes);
+       state->vwv = vwv;
 
-       DLIST_ADD_END(cli->outstanding_requests, cli_req,
-                     struct cli_request *);
-       talloc_set_destructor(cli_req, cli_request_destructor);
+       SSVAL(state->bytecount_buf, 0, iov_len(bytes_iov, iov_count));
 
-       DEBUG(10, ("cli_request_new: mid=%d\n", cli_req->mid));
+       state->iov[0].iov_base = (void *)state->header;
+       state->iov[0].iov_len  = sizeof(state->header);
+       state->iov[1].iov_base = (void *)state->vwv;
+       state->iov[1].iov_len  = wct * sizeof(uint16_t);
+       state->iov[2].iov_base = (void *)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));
+       }
+       state->iov_count = iov_count + 3;
 
-       *preq = cli_req;
+       endtime = timeval_current_ofs(0, cli->timeout * 1000);
+       if (!tevent_req_set_endtime(result, ev, endtime)) {
+               tevent_req_nomem(NULL, result);
+       }
        return result;
 }
 
-/*
- * Convenience function to get the SMB part out of an async_req
- */
-
-struct cli_request *cli_request_get(struct async_req *req)
+static NTSTATUS cli_signv(struct cli_state *cli, struct iovec *iov, int count,
+                         uint32_t *seqnum)
 {
-       if (req == NULL) {
-               return NULL;
+       uint8_t *buf;
+
+       /*
+        * Obvious optimization: Make cli_calculate_sign_mac work with struct
+        * iovec directly. MD5Update would do that just fine.
+        */
+
+       if ((count <= 0) || (iov[0].iov_len < smb_wct)) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
-       return talloc_get_type_abort(req->private_data, struct cli_request);
+
+       buf = iov_concat(talloc_tos(), iov, count);
+       if (buf == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       cli_calculate_sign_mac(cli, (char *)buf, seqnum);
+       memcpy(iov[0].iov_base, buf, iov[0].iov_len);
+
+       TALLOC_FREE(buf);
+       return NT_STATUS_OK;
 }
 
-/*
- * A PDU has arrived on cli->evt_inbuf
- */
+static void cli_smb_sent(struct tevent_req *subreq);
 
-static void handle_incoming_pdu(struct cli_state *cli)
+static NTSTATUS cli_smb_req_iov_send(struct tevent_req *req,
+                                    struct cli_smb_state *state,
+                                    struct iovec *iov, int iov_count)
 {
-       struct cli_request *req;
-       uint16_t mid;
-       size_t raw_pdu_len, buf_len, pdu_len, rest_len;
-       char *pdu;
+       struct tevent_req *subreq;
        NTSTATUS status;
 
-       /*
-        * 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;
+       if (state->cli->fd == -1) {
+               return NT_STATUS_CONNECTION_INVALID;
+       }
 
-       if (buf_len == raw_pdu_len) {
-               /*
-                * Optimal case: Exactly one PDU was in the socket buffer
-                */
-               pdu = cli->evt_inbuf;
-               cli->evt_inbuf = NULL;
+       if (iov[0].iov_len < smb_wct) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
-       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);
+       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));
+       }
 
-                       memmove(cli->evt_inbuf, cli->evt_inbuf + raw_pdu_len,
-                               buf_len - raw_pdu_len);
+       smb_setlen((char *)iov[0].iov_base, iov_len(iov, iov_count) - 4);
 
-                       cli->evt_inbuf = TALLOC_REALLOC_ARRAY(
-                               NULL, cli->evt_inbuf, char, rest_len);
+       status = cli_signv(state->cli, iov, iov_count, &state->seqnum);
 
-                       if (pdu == NULL) {
-                               status = NT_STATUS_NO_MEMORY;
-                               goto invalidate_requests;
-                       }
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       if (cli_encryption_on(state->cli)) {
+               char *buf, *enc_buf;
+
+               buf = (char *)iov_concat(talloc_tos(), iov, iov_count);
+               if (buf == NULL) {
+                       return NT_STATUS_NO_MEMORY;
                }
-               else {
-                       /*
-                        * The PDU is larger than the rest, talloc_memdup the
-                        * rest
-                        */
-                       pdu = cli->evt_inbuf;
+               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: %s\n",
+                                 nt_errstr(status)));
+                       return status;
+               }
+               buf = (char *)talloc_memdup(state, enc_buf,
+                                           smb_len(enc_buf)+4);
+               SAFE_FREE(enc_buf);
+               if (buf == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               iov[0].iov_base = (void *)buf;
+               iov[0].iov_len = talloc_get_size(buf);
+               iov_count = 1;
+       }
+       subreq = writev_send(state, state->ev, state->cli->outgoing,
+                            state->cli->fd, false, iov, iov_count);
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       tevent_req_set_callback(subreq, cli_smb_sent, req);
+       return NT_STATUS_OK;
+}
 
-                       cli->evt_inbuf = (char *)talloc_memdup(
-                               cli, pdu + raw_pdu_len, rest_len);
+NTSTATUS cli_smb_req_send(struct tevent_req *req)
+{
+       struct cli_smb_state *state = tevent_req_data(
+               req, struct cli_smb_state);
 
-                       if (cli->evt_inbuf == NULL) {
-                               status = NT_STATUS_NO_MEMORY;
-                               goto invalidate_requests;
-                       }
+       return cli_smb_req_iov_send(req, state, state->iov, state->iov_count);
+}
+
+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;
+       NTSTATUS status;
+
+       iov.iov_base = CONST_DISCARD(void *, bytes);
+       iov.iov_len = num_bytes;
+
+       req = cli_smb_req_create(mem_ctx, ev, cli, smb_command,
+                                additional_flags, wct, vwv, 1, &iov);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       status = cli_smb_req_send(req);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return tevent_req_post(req, ev);
+       }
+       return req;
+}
+
+static void cli_smb_sent(struct tevent_req *subreq)
+{
+       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) {
+               if (state->cli->fd != -1) {
+                       close(state->cli->fd);
+                       state->cli->fd = -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;
+               }
        }
 
-       /*
-        * TODO: Handle oplock break requests
-        */
+       if (!cli_smb_req_set_pending(req)) {
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
+}
 
-       if (cli_encryption_on(cli) && CVAL(pdu, 0) == 0) {
+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;
+       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) {
+               if (cli->fd != -1) {
+                       close(cli->fd);
+                       cli->fd = -1;
+               }
+               status = map_nt_error_from_unix(err);
+               goto fail;
+       }
+
+       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;
+       }
+
+       if (cli_encryption_on(cli) && (CVAL(inbuf, 0) == 0)) {
                uint16_t enc_ctx_num;
 
-               status = get_enc_ctx_num((uint8_t *)pdu, &enc_ctx_num);
+               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 invalidate_requests;
+                       goto fail;
                }
 
                if (enc_ctx_num != cli->trans_enc_state->enc_ctx_num) {
@@ -251,234 +649,434 @@ static void handle_incoming_pdu(struct cli_state *cli)
                                   enc_ctx_num,
                                   cli->trans_enc_state->enc_ctx_num));
                        status = NT_STATUS_INVALID_HANDLE;
-                       goto invalidate_requests;
+                       goto fail;
                }
 
                status = common_decrypt_buffer(cli->trans_enc_state,
-                                              pdu);
+                                              (char *)inbuf);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(10, ("common_decrypt_buffer returned %s\n",
                                   nt_errstr(status)));
-                       goto invalidate_requests;
+                       goto fail;
                }
        }
 
-       if (!cli_check_sign_mac(cli, pdu)) {
-               DEBUG(10, ("cli_check_sign_mac failed\n"));
-               status = NT_STATUS_ACCESS_DENIED;
-               goto invalidate_requests;
-       }
-
-       mid = SVAL(pdu, smb_mid);
-
-       DEBUG(10, ("handle_incoming_pdu: got mid %d\n", mid));
+       mid = SVAL(inbuf, smb_mid);
+       num_pending = talloc_array_length(cli->pending);
 
-       for (req = cli->outstanding_requests; req; req = req->next) {
-               if (req->mid == mid) {
+       for (i=0; i<num_pending; i++) {
+               if (mid == cli_smb_req_mid(cli->pending[i])) {
                        break;
                }
        }
-
-       pdu_len = smb_len(pdu) + 4;
-
-       if (req == NULL) {
-               DEBUG(3, ("Request for mid %d not found, dumping PDU\n", mid));
-
-               TALLOC_FREE(pdu);
-               return;
+       if (i == num_pending) {
+               /* Dump unexpected reply */
+               TALLOC_FREE(inbuf);
+               goto done;
        }
 
-       req->inbuf = talloc_move(req, &pdu);
+       oplock_break = false;
 
-       async_req_done(req->async);
-       return;
+       if (mid == 0xffff) {
+               /*
+                * Paranoia checks that this is really an oplock break request.
+                */
+               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;
+               }
+       }
 
- invalidate_requests:
+       req = cli->pending[i];
+       state = tevent_req_data(req, struct cli_smb_state);
 
-       DEBUG(10, ("handle_incoming_pdu: Aborting with %s\n",
-                  nt_errstr(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 (req = cli->outstanding_requests; req; req = req->next) {
-               async_req_error(req->async, status);
+       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);
+       }
+ 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);
        }
        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);
+       }
 }
 
-/*
- * fd event callback. This is the basic connection to the socket
- */
-
-static void cli_state_handler(struct event_context *event_ctx,
-                             struct fd_event *event, uint16 flags, void *p)
+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_state *cli = (struct cli_state *)p;
-       struct cli_request *req;
+       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 (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
 
-       DEBUG(11, ("cli_state_handler called with flags %d\n", flags));
+       if (state->inbuf == NULL) {
+               /* This was a request without a reply */
+               return NT_STATUS_OK;
+       }
 
-       if (flags & EVENT_FD_READ) {
-               int res, available;
-               size_t old_size, new_size;
-               char *tmp;
+       wct_ofs = smb_wct;
+       cmd = CVAL(state->inbuf, smb_com);
 
-               res = ioctl(cli->fd, FIONREAD, &available);
-               if (res == -1) {
-                       DEBUG(10, ("ioctl(FIONREAD) failed: %s\n",
-                                  strerror(errno)));
-                       goto sock_error;
+       for (i=0; i<state->chain_num; i++) {
+               if (i < state->chain_num-1) {
+                       if (cmd == 0xff) {
+                               return NT_STATUS_REQUEST_ABORTED;
+                       }
+                       if (!is_andx_req(cmd)) {
+                               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                       }
                }
 
-               if (available == 0) {
-                       /* EOF */
-                       goto sock_error;
+               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.
+                        */
+                       return NT_STATUS_REQUEST_ABORTED;
                }
 
-               old_size = talloc_get_size(cli->evt_inbuf);
-               new_size = old_size + available;
+               wct_ofs = SVAL(state->inbuf, wct_ofs + 3);
 
-               if (new_size < old_size) {
-                       /* wrap */
-                       goto sock_error;
-               }
+               /*
+                * Skip the all-present length field. No overflow, we've just
+                * put a 16-bit value into a size_t.
+                */
+               wct_ofs += 4;
 
-               tmp = TALLOC_REALLOC_ARRAY(cli, cli->evt_inbuf, char,
-                                          new_size);
-               if (tmp == NULL) {
-                       /* nomem */
-                       goto sock_error;
+               if (wct_ofs+2 > talloc_get_size(state->inbuf)) {
+                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
                }
-               cli->evt_inbuf = tmp;
 
-               res = recv(cli->fd, cli->evt_inbuf + old_size, available, 0);
-               if (res == -1) {
-                       DEBUG(10, ("recv failed: %s\n", strerror(errno)));
-                       goto sock_error;
-               }
+               cmd = CVAL(state->inbuf, wct_ofs + 1);
+       }
 
-               DEBUG(11, ("cli_state_handler: received %d bytes, "
-                          "smb_len(evt_inbuf) = %d\n", (int)res,
-                          smb_len(cli->evt_inbuf)));
+       status = cli_pull_error((char *)state->inbuf);
 
-               /* recv *might* have returned less than announced */
-               new_size = old_size + res;
+       if (!have_andx_command((char *)state->inbuf, wct_ofs)) {
 
-               /* shrink, so I don't expect errors here */
-               cli->evt_inbuf = TALLOC_REALLOC_ARRAY(cli, cli->evt_inbuf,
-                                                     char, new_size);
+               if ((cmd == SMBsesssetupX)
+                   && NT_STATUS_EQUAL(
+                           status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+                       /*
+                        * NT_STATUS_MORE_PROCESSING_REQUIRED is a
+                        * valid return code for session setup
+                        */
+                       goto no_err;
+               }
 
-               while ((cli->evt_inbuf != NULL)
-                      && ((smb_len(cli->evt_inbuf) + 4) <= new_size)) {
+               if (NT_STATUS_IS_ERR(status)) {
                        /*
-                        * we've got a complete NBT level PDU in evt_inbuf
+                        * The last command takes the error code. All
+                        * further commands down the requested chain
+                        * will get a NT_STATUS_REQUEST_ABORTED.
                         */
-                       handle_incoming_pdu(cli);
-                       new_size = talloc_get_size(cli->evt_inbuf);
+                       return status;
                }
        }
 
-       if (flags & EVENT_FD_WRITE) {
-               size_t to_send;
-               ssize_t sent;
+no_err:
 
-               for (req = cli->outstanding_requests; req; req = req->next) {
-                       to_send = smb_len(req->outbuf)+4;
-                       if (to_send > req->sent) {
-                               break;
-                       }
-               }
+       wct = CVAL(state->inbuf, wct_ofs);
+       bytes_offset = wct_ofs + 1 + wct * sizeof(uint16_t);
+       num_bytes = SVAL(state->inbuf, bytes_offset);
 
-               if (req == NULL) {
-                       event_fd_set_not_writeable(event);
-                       return;
-               }
+       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(state->inbuf))
+           || (bytes_offset > 0xffff)) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+
+       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 status;
+}
+
+size_t cli_smb_wct_ofs(struct tevent_req **reqs, int num_reqs)
+{
+       size_t wct_ofs;
+       int i;
+
+       wct_ofs = smb_wct - 4;
+
+       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;
+       }
+       return wct_ofs;
+}
+
+NTSTATUS cli_smb_chain_send(struct tevent_req **reqs, int num_reqs)
+{
+       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;
+       NTSTATUS status;
+
+       iovlen = 0;
+       for (i=0; i<num_reqs; i++) {
+               state = tevent_req_data(reqs[i], struct cli_smb_state);
+               iovlen += state->iov_count;
+       }
+
+       iov = talloc_array(last_state, struct iovec, iovlen);
+       if (iov == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       first_state->chained_requests = (struct tevent_req **)talloc_memdup(
+               last_state, reqs, sizeof(*reqs) * num_reqs);
+       if (first_state->chained_requests == NULL) {
+               TALLOC_FREE(iov);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       wct_offset = smb_wct - 4;
+       this_iov = iov;
+
+       for (i=0; i<num_reqs; i++) {
+               size_t next_padding = 0;
+               uint16_t *vwv;
 
-               sent = send(cli->fd, req->outbuf + req->sent,
-                           to_send - req->sent, 0);
+               state = tevent_req_data(reqs[i], struct cli_smb_state);
 
-               if (sent < 0) {
-                       goto sock_error;
+               if (i < num_reqs-1) {
+                       if (!is_andx_req(CVAL(state->header, smb_com))
+                           || CVAL(state->header, smb_wct) < 2) {
+                               TALLOC_FREE(iov);
+                               TALLOC_FREE(first_state->chained_requests);
+                               return NT_STATUS_INVALID_PARAMETER;
+                       }
                }
 
-               req->sent += sent;
+               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 (req->sent == to_send) {
-                       return;
+               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 = (void *)&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;
        }
-       return;
 
- sock_error:
-       for (req = cli->outstanding_requests; req; req = req->next) {
-               req->async->state = ASYNC_REQ_ERROR;
-               req->async->status = map_nt_error_from_unix(errno);
+       status = cli_smb_req_iov_send(reqs[0], last_state, iov, iovlen);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(iov);
+               TALLOC_FREE(first_state->chained_requests);
+               return status;
        }
-       TALLOC_FREE(cli->fd_event);
-       close(cli->fd);
-       cli->fd = -1;
+
+       return NT_STATUS_OK;
 }
 
-/*
- * Holder for a talloc_destructor, we need to zero out the pointers in cli
- * when deleting
- */
-struct cli_tmp_event {
-       struct cli_state *cli;
-};
+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;
+}
 
-static int cli_tmp_event_destructor(struct cli_tmp_event *e)
+bool cli_has_async_calls(struct cli_state *cli)
 {
-       TALLOC_FREE(e->cli->fd_event);
-       TALLOC_FREE(e->cli->event_ctx);
-       return 0;
+       return ((tevent_queue_length(cli->outgoing) != 0)
+               || (talloc_array_length(cli->pending) != 0));
 }
 
-/*
- * Create a temporary event context for use in the sync helper functions
- */
+struct cli_smb_oplock_break_waiter_state {
+       uint16_t fnum;
+       uint8_t level;
+};
 
-struct cli_tmp_event *cli_tmp_event_ctx(TALLOC_CTX *mem_ctx,
-                                       struct cli_state *cli)
+static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq);
+
+struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
+                                                   struct event_context *ev,
+                                                   struct cli_state *cli)
 {
-       struct cli_tmp_event *state;
+       struct tevent_req *req, *subreq;
+       struct cli_smb_oplock_break_waiter_state *state;
+       struct cli_smb_state *smb_state;
 
-       if (cli->event_ctx != NULL) {
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_smb_oplock_break_waiter_state);
+       if (req == NULL) {
                return NULL;
        }
 
-       state = talloc(mem_ctx, struct cli_tmp_event);
-       if (state == NULL) {
-               return NULL;
+       /*
+        * 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.
+        */
+       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);
        }
-       state->cli = cli;
-       talloc_set_destructor(state, cli_tmp_event_destructor);
+       smb_state = tevent_req_data(subreq, struct cli_smb_state);
+       SSVAL(smb_state->header, smb_mid, 0xffff);
 
-       cli->event_ctx = event_context_init(state);
-       if (cli->event_ctx == NULL) {
-               TALLOC_FREE(state);
-               return NULL;
+       if (!cli_smb_req_set_pending(subreq)) {
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+               return tevent_req_post(req, ev);
        }
+       tevent_req_set_callback(subreq, cli_smb_oplock_break_waiter_done, req);
+       return req;
+}
 
-       cli->fd_event = event_add_fd(cli->event_ctx, state, cli->fd,
-                                    EVENT_FD_READ, cli_state_handler, cli);
-       if (cli->fd_event == NULL) {
-               TALLOC_FREE(state);
-               return NULL;
+static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq)
+{
+       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;
+
+       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;
        }
-       return state;
+       state->fnum = SVAL(vwv+2, 0);
+       state->level = CVAL(vwv+3, 1);
+       tevent_req_done(req);
 }
 
-/*
- * Attach an event context permanently to a cli_struct
- */
-
-NTSTATUS cli_add_event_ctx(struct cli_state *cli,
-                          struct event_context *event_ctx)
+NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
+                                         uint16_t *pfnum,
+                                         uint8_t *plevel)
 {
-       cli->event_ctx = event_ctx;
-       cli->fd_event = event_add_fd(event_ctx, cli, cli->fd, EVENT_FD_READ,
-                                    cli_state_handler, cli);
-       if (cli->fd_event == NULL) {
-               return NT_STATUS_NO_MEMORY;
+       struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
+               req, struct cli_smb_oplock_break_waiter_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
        }
+       *pfnum = state->fnum;
+       *plevel = state->level;
        return NT_STATUS_OK;
 }