s3:utils: Use C99 initializer for poptOption in sharesec
[vlendec/samba-autobuild/.git] / source3 / libsmb / clitrans.c
index d8cd8e8cbdd94f50209b0f94d094b74c7477ed7f..e5b4c4a4618766e9c0f12d195c5b26d59f9e2831 100644 (file)
 #include "libsmb/libsmb.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
-
-struct trans_recvblob {
-       uint8_t *data;
-       uint32_t max, total, received;
-};
+#include "../libcli/smb/smbXcli_base.h"
 
 struct cli_trans_state {
        struct cli_state *cli;
-       struct event_context *ev;
-       uint8_t cmd;
-       uint16_t mid;
-       uint32_t seqnum;
-       const char *pipe_name;
-       uint8_t *pipe_name_conv;
-       size_t pipe_name_conv_len;
-       uint16_t fid;
-       uint16_t function;
-       int flags;
+       struct tevent_req *subreq;
+       uint16_t recv_flags2;
        uint16_t *setup;
-       uint8_t num_setup, max_setup;
+       uint8_t num_setup;
        uint8_t *param;
-       uint32_t num_param, param_sent;
+       uint32_t num_param;
        uint8_t *data;
-       uint32_t num_data, data_sent;
-
-       uint8_t num_rsetup;
-       uint16_t *rsetup;
-       struct trans_recvblob rparam;
-       struct trans_recvblob rdata;
-       uint16_t recv_flags2;
-
-       struct iovec iov[4];
-       uint8_t pad[4];
-       uint16_t vwv[32];
+       uint32_t num_data;
 };
 
-static NTSTATUS cli_pull_trans(uint8_t *inbuf,
-                              uint8_t wct, uint16_t *vwv,
-                              uint16_t num_bytes, uint8_t *bytes,
-                              uint8_t smb_cmd, bool expect_first_reply,
-                              uint8_t *pnum_setup, uint16_t **psetup,
-                              uint32_t *ptotal_param, uint32_t *pnum_param,
-                              uint32_t *pparam_disp, uint8_t **pparam,
-                              uint32_t *ptotal_data, uint32_t *pnum_data,
-                              uint32_t *pdata_disp, uint8_t **pdata)
-{
-       uint32_t param_ofs, data_ofs;
-
-       if (expect_first_reply) {
-               if ((wct != 0) || (num_bytes != 0)) {
-                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
-               }
-               return NT_STATUS_OK;
-       }
-
-       switch (smb_cmd) {
-       case SMBtrans:
-       case SMBtrans2:
-               if (wct < 10) {
-                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
-               }
-               *ptotal_param   = SVAL(vwv + 0, 0);
-               *ptotal_data    = SVAL(vwv + 1, 0);
-               *pnum_param     = SVAL(vwv + 3, 0);
-               param_ofs       = SVAL(vwv + 4, 0);
-               *pparam_disp    = SVAL(vwv + 5, 0);
-               *pnum_data      = SVAL(vwv + 6, 0);
-               data_ofs        = SVAL(vwv + 7, 0);
-               *pdata_disp     = SVAL(vwv + 8, 0);
-               *pnum_setup     = CVAL(vwv + 9, 0);
-               if (wct < 10 + (*pnum_setup)) {
-                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
-               }
-               *psetup = vwv + 10;
-
-               break;
-       case SMBnttrans:
-               if (wct < 18) {
-                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
-               }
-               *ptotal_param   = IVAL(vwv, 3);
-               *ptotal_data    = IVAL(vwv, 7);
-               *pnum_param     = IVAL(vwv, 11);
-               param_ofs       = IVAL(vwv, 15);
-               *pparam_disp    = IVAL(vwv, 19);
-               *pnum_data      = IVAL(vwv, 23);
-               data_ofs        = IVAL(vwv, 27);
-               *pdata_disp     = IVAL(vwv, 31);
-               *pnum_setup     = CVAL(vwv, 35);
-               *psetup         = vwv + 18;
-               break;
-
-       default:
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       /*
-        * Check for buffer overflows. data_ofs needs to be checked against
-        * the incoming buffer length, data_disp against the total
-        * length. Likewise for param_ofs/param_disp.
-        */
-
-       if (trans_oob(smb_len(inbuf), param_ofs, *pnum_param)
-           || trans_oob(*ptotal_param, *pparam_disp, *pnum_param)
-           || trans_oob(smb_len(inbuf), data_ofs, *pnum_data)
-           || trans_oob(*ptotal_data, *pdata_disp, *pnum_data)) {
-               return NT_STATUS_INVALID_NETWORK_RESPONSE;
-       }
-
-       *pparam = (uint8_t *)inbuf + 4 + param_ofs;
-       *pdata = (uint8_t *)inbuf + 4 + data_ofs;
-
-       return NT_STATUS_OK;
-}
-
-static NTSTATUS cli_trans_pull_blob(TALLOC_CTX *mem_ctx,
-                                   struct trans_recvblob *blob,
-                                   uint32_t total, uint32_t thistime,
-                                   uint8_t *buf, uint32_t displacement)
-{
-       if (blob->data == NULL) {
-               if (total > blob->max) {
-                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
-               }
-               blob->total = total;
-               blob->data = talloc_array(mem_ctx, uint8_t, total);
-               if (blob->data == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-       }
-
-       if (total > blob->total) {
-               return NT_STATUS_INVALID_NETWORK_RESPONSE;
-       }
-
-       if (thistime) {
-               memcpy(blob->data + displacement, buf, thistime);
-               blob->received += thistime;
-       }
-
-       return NT_STATUS_OK;
-}
-
-static void cli_trans_format(struct cli_trans_state *state, uint8_t *pwct,
-                            int *piov_count)
-{
-       uint8_t wct = 0;
-       struct iovec *iov = state->iov;
-       uint8_t *pad = state->pad;
-       uint16_t *vwv = state->vwv;
-       uint32_t param_offset;
-       uint32_t this_param = 0;
-       uint32_t this_data = 0;
-       uint32_t useable_space;
-       uint8_t cmd;
-
-       cmd = state->cmd;
-
-       if ((state->param_sent != 0) || (state->data_sent != 0)) {
-               /* The secondary commands are one after the primary ones */
-               cmd += 1;
-       }
-
-       param_offset = smb_size - 4;
-
-       switch (cmd) {
-       case SMBtrans:
-               pad[0] = 0;
-               iov[0].iov_base = (void *)pad;
-               iov[0].iov_len = 1;
-               iov[1].iov_base = (void *)state->pipe_name_conv;
-               iov[1].iov_len = state->pipe_name_conv_len;
-               wct = 14 + state->num_setup;
-               param_offset += iov[0].iov_len + iov[1].iov_len;
-               iov += 2;
-               break;
-       case SMBtrans2:
-               pad[0] = 0;
-               pad[1] = 'D'; /* Copy this from "old" 3.0 behaviour */
-               pad[2] = ' ';
-               iov[0].iov_base = (void *)pad;
-               iov[0].iov_len = 3;
-               wct = 14 + state->num_setup;
-               param_offset += 3;
-               iov += 1;
-               break;
-       case SMBtranss:
-               wct = 8;
-               break;
-       case SMBtranss2:
-               wct = 9;
-               break;
-       case SMBnttrans:
-               wct = 19 + state->num_setup;
-               break;
-       case SMBnttranss:
-               wct = 18;
-               break;
-       }
-
-       useable_space = state->cli->max_xmit - smb_size - sizeof(uint16_t)*wct;
-
-       if (state->param_sent < state->num_param) {
-               this_param = MIN(state->num_param - state->param_sent,
-                                useable_space);
-               iov[0].iov_base = (void *)(state->param + state->param_sent);
-               iov[0].iov_len = this_param;
-               iov += 1;
-       }
-
-       if (state->data_sent < state->num_data) {
-               this_data = MIN(state->num_data - state->data_sent,
-                               useable_space - this_param);
-               iov[0].iov_base = (void *)(state->data + state->data_sent);
-               iov[0].iov_len = this_data;
-               iov += 1;
-       }
-
-       param_offset += wct * sizeof(uint16_t);
-
-       DEBUG(10, ("num_setup=%u, max_setup=%u, "
-                  "param_total=%u, this_param=%u, max_param=%u, "
-                  "data_total=%u, this_data=%u, max_data=%u, "
-                  "param_offset=%u, param_disp=%u, data_disp=%u\n",
-                  (unsigned)state->num_setup, (unsigned)state->max_setup,
-                  (unsigned)state->num_param, (unsigned)this_param,
-                  (unsigned)state->rparam.max,
-                  (unsigned)state->num_data, (unsigned)this_data,
-                  (unsigned)state->rdata.max,
-                  (unsigned)param_offset,
-                  (unsigned)state->param_sent, (unsigned)state->data_sent));
-
-       switch (cmd) {
-       case SMBtrans:
-       case SMBtrans2:
-               SSVAL(vwv + 0, 0, state->num_param);
-               SSVAL(vwv + 1, 0, state->num_data);
-               SSVAL(vwv + 2, 0, state->rparam.max);
-               SSVAL(vwv + 3, 0, state->rdata.max);
-               SCVAL(vwv + 4, 0, state->max_setup);
-               SCVAL(vwv + 4, 1, 0);   /* reserved */
-               SSVAL(vwv + 5, 0, state->flags);
-               SIVAL(vwv + 6, 0, 0);   /* timeout */
-               SSVAL(vwv + 8, 0, 0);   /* reserved */
-               SSVAL(vwv + 9, 0, this_param);
-               SSVAL(vwv +10, 0, param_offset);
-               SSVAL(vwv +11, 0, this_data);
-               SSVAL(vwv +12, 0, param_offset + this_param);
-               SCVAL(vwv +13, 0, state->num_setup);
-               SCVAL(vwv +13, 1, 0);   /* reserved */
-               memcpy(vwv + 14, state->setup,
-                      sizeof(uint16_t) * state->num_setup);
-               break;
-       case SMBtranss:
-       case SMBtranss2:
-               SSVAL(vwv + 0, 0, state->num_param);
-               SSVAL(vwv + 1, 0, state->num_data);
-               SSVAL(vwv + 2, 0, this_param);
-               SSVAL(vwv + 3, 0, param_offset);
-               SSVAL(vwv + 4, 0, state->param_sent);
-               SSVAL(vwv + 5, 0, this_data);
-               SSVAL(vwv + 6, 0, param_offset + this_param);
-               SSVAL(vwv + 7, 0, state->data_sent);
-               if (cmd == SMBtranss2) {
-                       SSVAL(vwv + 8, 0, state->fid);
-               }
-               break;
-       case SMBnttrans:
-               SCVAL(vwv + 0, 0, state->max_setup);
-               SSVAL(vwv + 0, 1, 0); /* reserved */
-               SIVAL(vwv + 1, 1, state->num_param);
-               SIVAL(vwv + 3, 1, state->num_data);
-               SIVAL(vwv + 5, 1, state->rparam.max);
-               SIVAL(vwv + 7, 1, state->rdata.max);
-               SIVAL(vwv + 9, 1, this_param);
-               SIVAL(vwv +11, 1, param_offset);
-               SIVAL(vwv +13, 1, this_data);
-               SIVAL(vwv +15, 1, param_offset + this_param);
-               SCVAL(vwv +17, 1, state->num_setup);
-               SSVAL(vwv +18, 0, state->function);
-               memcpy(vwv + 19, state->setup,
-                      sizeof(uint16_t) * state->num_setup);
-               break;
-       case SMBnttranss:
-               SSVAL(vwv + 0, 0, 0); /* reserved */
-               SCVAL(vwv + 1, 0, 0); /* reserved */
-               SIVAL(vwv + 1, 1, state->num_param);
-               SIVAL(vwv + 3, 1, state->num_data);
-               SIVAL(vwv + 5, 1, this_param);
-               SIVAL(vwv + 7, 1, param_offset);
-               SIVAL(vwv + 9, 1, state->param_sent);
-               SIVAL(vwv +11, 1, this_data);
-               SIVAL(vwv +13, 1, param_offset + this_param);
-               SIVAL(vwv +15, 1, state->data_sent);
-               SCVAL(vwv +17, 1, 0); /* reserved */
-               break;
-       }
-
-       state->param_sent += this_param;
-       state->data_sent += this_data;
-
-       *pwct = wct;
-       *piov_count = iov - state->iov;
-}
-
 static void cli_trans_done(struct tevent_req *subreq);
+static bool cli_trans_cancel(struct tevent_req *req);
 
 struct tevent_req *cli_trans_send(
-       TALLOC_CTX *mem_ctx, struct event_context *ev,
-       struct cli_state *cli, uint8_t cmd,
+       TALLOC_CTX *mem_ctx, struct tevent_context *ev,
+       struct cli_state *cli, uint16_t additional_flags2, uint8_t cmd,
        const char *pipe_name, uint16_t fid, uint16_t function, int flags,
        uint16_t *setup, uint8_t num_setup, uint8_t max_setup,
        uint8_t *param, uint32_t num_param, uint32_t max_param,
        uint8_t *data, uint32_t num_data, uint32_t max_data)
 {
-       struct tevent_req *req, *subreq;
+       struct tevent_req *req;
        struct cli_trans_state *state;
-       int iov_count;
-       uint8_t wct;
-       NTSTATUS status;
+       uint8_t additional_flags = 0;
+       uint8_t clear_flags = 0;
+       uint16_t clear_flags2 = 0;
 
        req = tevent_req_create(mem_ctx, &state, struct cli_trans_state);
        if (req == NULL) {
                return NULL;
        }
-
-       if ((cmd == SMBtrans) || (cmd == SMBtrans2)) {
-               if ((num_param > 0xffff) || (max_param > 0xffff)
-                   || (num_data > 0xffff) || (max_data > 0xffff)) {
-                       DEBUG(3, ("Attempt to send invalid trans2 request "
-                                 "(setup %u, params %u/%u, data %u/%u)\n",
-                                 (unsigned)num_setup,
-                                 (unsigned)num_param, (unsigned)max_param,
-                                 (unsigned)num_data, (unsigned)max_data));
-                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return tevent_req_post(req, ev);
-               }
-       }
-
-       /*
-        * The largest wct will be for nttrans (19+num_setup). Make sure we
-        * don't overflow state->vwv in cli_trans_format.
-        */
-
-       if ((num_setup + 19) > ARRAY_SIZE(state->vwv)) {
-               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-               return tevent_req_post(req, ev);
-       }
-
        state->cli = cli;
-       state->ev = ev;
-       state->cmd = cmd;
-       state->flags = flags;
-       state->num_rsetup = 0;
-       state->rsetup = NULL;
-       ZERO_STRUCT(state->rparam);
-       ZERO_STRUCT(state->rdata);
 
-       if ((pipe_name != NULL)
-           && (!convert_string_talloc(state, CH_UNIX,
-                                      cli_ucs2(cli) ? CH_UTF16LE : CH_DOS,
-                                      pipe_name, strlen(pipe_name) + 1,
-                                      &state->pipe_name_conv,
-                                      &state->pipe_name_conv_len))) {
-               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+       state->subreq = smb1cli_trans_send(state, ev,
+                                          cli->conn, cmd,
+                                          additional_flags, clear_flags,
+                                          additional_flags2, clear_flags2,
+                                          cli->timeout,
+                                          cli->smb1.pid,
+                                          cli->smb1.tcon,
+                                          cli->smb1.session,
+                                          pipe_name, fid, function, flags,
+                                          setup, num_setup, max_setup,
+                                          param, num_param, max_param,
+                                          data, num_data, max_data);
+       if (tevent_req_nomem(state->subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       state->fid = fid;       /* trans2 */
-       state->function = function; /* nttrans */
-
-       state->setup = setup;
-       state->num_setup = num_setup;
-       state->max_setup = max_setup;
-
-       state->param = param;
-       state->num_param = num_param;
-       state->param_sent = 0;
-       state->rparam.max = max_param;
-
-       state->data = data;
-       state->num_data = num_data;
-       state->data_sent = 0;
-       state->rdata.max = max_data;
+       tevent_req_set_callback(state->subreq, cli_trans_done, req);
+       tevent_req_set_cancel_fn(req, cli_trans_cancel);
+       return req;
+}
 
-       cli_trans_format(state, &wct, &iov_count);
+static bool cli_trans_cancel(struct tevent_req *req)
+{
+       struct cli_trans_state *state = tevent_req_data(
+               req, struct cli_trans_state);
+       bool ok;
 
-       subreq = cli_smb_req_create(state, ev, cli, cmd, 0, wct, state->vwv,
-                                   iov_count, state->iov);
-       if (tevent_req_nomem(subreq, req)) {
-               return tevent_req_post(req, ev);
-       }
-       state->mid = cli_smb_req_mid(subreq);
-       status = cli_smb_req_send(subreq);
-       if (!NT_STATUS_IS_OK(status)) {
-               tevent_req_nterror(req, status);
-               return tevent_req_post(req, state->ev);
-       }
-       cli_state_seqnum_persistent(cli, state->mid);
-       tevent_req_set_callback(subreq, cli_trans_done, req);
-       return req;
+       ok = tevent_req_cancel(state->subreq);
+       return ok;
 }
 
 static void cli_trans_done(struct tevent_req *subreq)
@@ -430,115 +95,19 @@ static void cli_trans_done(struct tevent_req *subreq)
        struct cli_trans_state *state = tevent_req_data(
                req, struct cli_trans_state);
        NTSTATUS status;
-       bool sent_all;
-       uint8_t wct;
-       uint16_t *vwv;
-       uint32_t num_bytes;
-       uint8_t *bytes;
-       uint8_t *inbuf;
-       uint8_t num_setup       = 0;
-       uint16_t *setup         = NULL;
-       uint32_t total_param    = 0;
-       uint32_t num_param      = 0;
-       uint32_t param_disp     = 0;
-       uint32_t total_data     = 0;
-       uint32_t num_data       = 0;
-       uint32_t data_disp      = 0;
-       uint8_t *param          = NULL;
-       uint8_t *data           = NULL;
-
-       status = cli_smb_recv(subreq, state, &inbuf, 0, &wct, &vwv,
-                             &num_bytes, &bytes);
-       /*
-        * Do not TALLOC_FREE(subreq) here, we might receive more than
-        * one response for the same mid.
-        */
-
-       /*
-        * We can receive something like STATUS_MORE_ENTRIES, so don't use
-        * !NT_STATUS_IS_OK(status) here.
-        */
-
-       if (NT_STATUS_IS_ERR(status)) {
-               goto fail;
-       }
-
-       sent_all = ((state->param_sent == state->num_param)
-                   && (state->data_sent == state->num_data));
-
-       status = cli_pull_trans(
-               inbuf, wct, vwv, num_bytes, bytes,
-               state->cmd, !sent_all, &num_setup, &setup,
-               &total_param, &num_param, &param_disp, &param,
-               &total_data, &num_data, &data_disp, &data);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       if (!sent_all) {
-               int iov_count;
-
-               TALLOC_FREE(subreq);
-
-               cli_trans_format(state, &wct, &iov_count);
-
-               subreq = cli_smb_req_create(state, state->ev, state->cli,
-                                           state->cmd + 1, 0, wct, state->vwv,
-                                           iov_count, state->iov);
-               if (tevent_req_nomem(subreq, req)) {
-                       return;
-               }
-               cli_smb_req_set_mid(subreq, state->mid);
-
-               status = cli_smb_req_send(subreq);
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       goto fail;
-               }
-               tevent_req_set_callback(subreq, cli_trans_done, req);
-               return;
-       }
-
-       status = cli_trans_pull_blob(
-               state, &state->rparam, total_param, num_param, param,
-               param_disp);
 
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("Pulling params failed: %s\n", nt_errstr(status)));
-               goto fail;
-       }
-
-       status = cli_trans_pull_blob(
-               state, &state->rdata, total_data, num_data, data,
-               data_disp);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("Pulling data failed: %s\n", nt_errstr(status)));
-               goto fail;
-       }
-
-       if ((state->rparam.total == state->rparam.received)
-           && (state->rdata.total == state->rdata.received)) {
-               state->recv_flags2 = SVAL(inbuf, smb_flg2);
-               TALLOC_FREE(subreq);
-               cli_state_seqnum_remove(state->cli, state->mid);
-               tevent_req_done(req);
+       status = smb1cli_trans_recv(
+               subreq,
+               state,
+               &state->recv_flags2,
+               &state->setup, 0, &state->num_setup,
+               &state->param, 0, &state->num_param,
+               &state->data, 0, &state->num_data);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
                return;
        }
-
-       TALLOC_FREE(inbuf);
-
-       if (!cli_smb_req_set_pending(subreq)) {
-               status = NT_STATUS_NO_MEMORY;
-               goto fail;
-       }
-       return;
-
- fail:
-       cli_state_seqnum_remove(state->cli, state->mid);
-       TALLOC_FREE(subreq);
-       tevent_req_nterror(req, status);
+       tevent_req_done(req);
 }
 
 NTSTATUS cli_trans_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
@@ -552,44 +121,52 @@ NTSTATUS cli_trans_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 {
        struct cli_trans_state *state = tevent_req_data(
                req, struct cli_trans_state);
-       NTSTATUS status;
+       NTSTATUS status = NT_STATUS_OK;
+       bool map_dos_errors = true;
 
        if (tevent_req_is_nterror(req, &status)) {
-               return status;
+               goto map_error;
        }
 
-       if ((state->num_rsetup < min_setup)
-           || (state->rparam.total < min_param)
-           || (state->rdata.total < min_data)) {
+       if ((state->num_setup < min_setup) ||
+           (state->num_param < min_param) ||
+           (state->num_data < min_data)) {
                return NT_STATUS_INVALID_NETWORK_RESPONSE;
        }
 
        if (recv_flags2 != NULL) {
                *recv_flags2 = state->recv_flags2;
        }
-
        if (setup != NULL) {
-               *setup = talloc_move(mem_ctx, &state->rsetup);
-               *num_setup = state->num_rsetup;
-       } else {
-               TALLOC_FREE(state->rsetup);
+               *setup = talloc_move(mem_ctx, &state->setup);
+               *num_setup = state->num_setup;
        }
-
        if (param != NULL) {
-               *param = talloc_move(mem_ctx, &state->rparam.data);
-               *num_param = state->rparam.total;
-       } else {
-               TALLOC_FREE(state->rparam.data);
+               *param = talloc_move(mem_ctx, &state->param);
+               *num_param = state->num_param;
        }
-
        if (data != NULL) {
-               *data = talloc_move(mem_ctx, &state->rdata.data);
-               *num_data = state->rdata.total;
-       } else {
-               TALLOC_FREE(state->rdata.data);
+               *data = talloc_move(mem_ctx, &state->data);
+               *num_data = state->num_data;
        }
 
-       return NT_STATUS_OK;
+map_error:
+       map_dos_errors = state->cli->map_dos_errors;
+       state->cli->raw_status = status;
+
+       if (NT_STATUS_IS_DOS(status) && map_dos_errors) {
+               uint8_t eclass = NT_STATUS_DOS_CLASS(status);
+               uint16_t ecode = NT_STATUS_DOS_CODE(status);
+               /*
+                * TODO: is it really a good idea to do a mapping here?
+                *
+                * The old cli_pull_error() also does it, so I do not change
+                * the behavior yet.
+                */
+               status = dos_to_ntstatus(eclass, ecode);
+       }
+
+       return status;
 }
 
 NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
@@ -605,44 +182,43 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
                   uint8_t **rdata, uint32_t min_rdata, uint32_t *num_rdata)
 {
        TALLOC_CTX *frame = talloc_stackframe();
-       struct event_context *ev;
+       struct tevent_context *ev;
        struct tevent_req *req;
-       NTSTATUS status = NT_STATUS_OK;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       if (cli_has_async_calls(cli)) {
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
                /*
                 * Can't use sync call while an async call is in flight
                 */
                status = NT_STATUS_INVALID_PARAMETER;
                goto fail;
        }
-
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
-               status = NT_STATUS_NO_MEMORY;
                goto fail;
        }
-
-       req = cli_trans_send(frame, ev, cli, trans_cmd,
-                            pipe_name, fid, function, flags,
-                            setup, num_setup, max_setup,
-                            param, num_param, max_param,
-                            data, num_data, max_data);
+       req = cli_trans_send(
+               frame,          /* mem_ctx */
+               ev,             /* ev */
+               cli,            /* cli */
+               0,              /* additional_flags2 */
+               trans_cmd,      /* cmd */
+               pipe_name, fid, function, flags,
+               setup, num_setup, max_setup,
+               param, num_param, max_param,
+               data, num_data, max_data);
        if (req == NULL) {
-               status = NT_STATUS_NO_MEMORY;
                goto fail;
        }
-
-       if (!tevent_req_poll(req, ev)) {
-               status = map_nt_error_from_unix(errno);
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
                goto fail;
        }
-
-       status = cli_trans_recv(req, mem_ctx, recv_flags2,
-                               rsetup, min_rsetup, num_rsetup,
-                               rparam, min_rparam, num_rparam,
-                               rdata, min_rdata, num_rdata);
- fail:
+       status = cli_trans_recv(
+               req, mem_ctx, recv_flags2,
+               rsetup, min_rsetup, num_rsetup,
+               rparam, min_rparam, num_rparam,
+               rdata, min_rdata, num_rdata);
+fail:
        TALLOC_FREE(frame);
        return status;
 }