s3-talloc Change TALLOC_ZERO_P() to talloc_zero()
[nivanova/samba-autobuild/.git] / source3 / libsmb / clientgen.c
index 64191239d334dc84f9557c5f788d338512d359f2..1122bbbaa507373960c6de2797a78b542b85c128 100644 (file)
 */
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "smb_signing.h"
+#include "async_smb.h"
 
 /*******************************************************************
  Setup the word count and byte count for a client smb message.
@@ -50,400 +54,49 @@ unsigned int cli_set_timeout(struct cli_state *cli, unsigned int timeout)
  Change the port number used to call on.
 ****************************************************************************/
 
-int cli_set_port(struct cli_state *cli, int port)
+void cli_set_port(struct cli_state *cli, int port)
 {
        cli->port = port;
-       return port;
 }
 
 /****************************************************************************
- Read an smb from a fd ignoring all keepalive packets. Note that the buffer 
- *MUST* be of size BUFFER_SIZE+SAFETY_MARGIN.
- The timeout is in milliseconds
-
- This is exactly the same as receive_smb except that it never returns
- a session keepalive packet (just as receive_smb used to do).
- receive_smb was changed to return keepalives as the oplock processing means this call
- should never go into a blocking read.
+ convenience routine to find if we negotiated ucs2
 ****************************************************************************/
 
-static ssize_t client_receive_smb(struct cli_state *cli, size_t maxlen)
+bool cli_ucs2(struct cli_state *cli)
 {
-       size_t len;
-
-       for(;;) {
-               NTSTATUS status;
-
-               set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK);
-
-               status = receive_smb_raw(cli->fd, cli->inbuf, cli->timeout,
-                                        maxlen, &len);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(10,("client_receive_smb failed\n"));
-                       show_msg(cli->inbuf);
-
-                       if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
-                               set_smb_read_error(&cli->smb_rw_error,
-                                                  SMB_READ_EOF);
-                               return -1;
-                       }
-
-                       if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-                               set_smb_read_error(&cli->smb_rw_error,
-                                                  SMB_READ_TIMEOUT);
-                               return -1;
-                       }
-
-                       set_smb_read_error(&cli->smb_rw_error, SMB_READ_ERROR);
-                       return -1;
-               }
-
-               if (len < 0) {
-                       return len;
-               }
-
-               /* Ignore session keepalive packets. */
-               if(CVAL(cli->inbuf,0) != SMBkeepalive) {
-                       break;
-               }
-       }
-
-       if (cli_encryption_on(cli)) {
-               NTSTATUS status = cli_decrypt_message(cli);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("SMB decryption failed on incoming packet! Error %s\n",
-                               nt_errstr(status)));
-                       cli->smb_rw_error = SMB_READ_BAD_DECRYPT;
-                       return -1;
-               }
-       }
-
-       show_msg(cli->inbuf);
-       return len;
+       return ((cli->capabilities & CAP_UNICODE) != 0);
 }
 
-/****************************************************************************
- Recv an smb.
-****************************************************************************/
-
-bool cli_receive_smb(struct cli_state *cli)
+bool cli_state_seqnum_persistent(struct cli_state *cli,
+                                uint16_t mid)
 {
-       ssize_t len;
-
-       /* fd == -1 causes segfaults -- Tom (tom@ninja.nl) */
-       if (cli->fd == -1)
-               return false; 
-
- again:
-       len = client_receive_smb(cli, 0);
-       
-       if (len > 0) {
-               /* it might be an oplock break request */
-               if (!(CVAL(cli->inbuf, smb_flg) & FLAG_REPLY) &&
-                   CVAL(cli->inbuf,smb_com) == SMBlockingX &&
-                   SVAL(cli->inbuf,smb_vwv6) == 0 &&
-                   SVAL(cli->inbuf,smb_vwv7) == 0) {
-                       if (cli->oplock_handler) {
-                               int fnum = SVAL(cli->inbuf,smb_vwv2);
-                               unsigned char level = CVAL(cli->inbuf,smb_vwv3+1);
-                               if (!cli->oplock_handler(cli, fnum, level)) {
-                                       return false;
-                               }
-                       }
-                       /* try to prevent loops */
-                       SCVAL(cli->inbuf,smb_com,0xFF);
-                       goto again;
-               }
-       }
+       struct cli_state_seqnum *c;
 
-       /* If the server is not responding, note that now */
-       if (len < 0) {
-                DEBUG(0, ("Receiving SMB: Server stopped responding\n"));
-               close(cli->fd);
-               cli->fd = -1;
-               return false;
-       }
-
-       if (!cli_check_sign_mac(cli, cli->inbuf)) {
-               /*
-                * If we get a signature failure in sessionsetup, then
-                * the server sometimes just reflects the sent signature
-                * back to us. Detect this and allow the upper layer to
-                * retrieve the correct Windows error message.
-                */
-               if (CVAL(cli->outbuf,smb_com) == SMBsesssetupX &&
-                       (smb_len(cli->inbuf) > (smb_ss_field + 8 - 4)) &&
-                       (SVAL(cli->inbuf,smb_flg2) & FLAGS2_SMB_SECURITY_SIGNATURES) &&
-                       memcmp(&cli->outbuf[smb_ss_field],&cli->inbuf[smb_ss_field],8) == 0 &&
-                       cli_is_error(cli)) {
-
-                       /*
-                        * Reflected signature on login error. 
-                        * Set bad sig but don't close fd.
-                        */
-                       cli->smb_rw_error = SMB_READ_BAD_SIG;
+       for (c = cli->seqnum; c; c = c->next) {
+               if (c->mid == mid) {
+                       c->persistent = true;
                        return true;
                }
-
-               DEBUG(0, ("SMB Signature verification failed on incoming packet!\n"));
-               cli->smb_rw_error = SMB_READ_BAD_SIG;
-               close(cli->fd);
-               cli->fd = -1;
-               return false;
-       };
-       return true;
-}
-
-/****************************************************************************
- Read the data portion of a readX smb.
- The timeout is in milliseconds
-****************************************************************************/
-
-ssize_t cli_receive_smb_data(struct cli_state *cli, char *buffer, size_t len)
-{
-       NTSTATUS status;
-
-       set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK);
-
-       status = read_socket_with_timeout(
-               cli->fd, buffer, len, len, cli->timeout, NULL);
-       if (NT_STATUS_IS_OK(status)) {
-               return len;
-       }
-
-       if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
-               set_smb_read_error(&cli->smb_rw_error, SMB_READ_EOF);
-               return -1;
-       }
-
-       if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-               set_smb_read_error(&cli->smb_rw_error, SMB_READ_TIMEOUT);
-               return -1;
        }
 
-       set_smb_read_error(&cli->smb_rw_error, SMB_READ_ERROR);
-       return -1;
-}
-
-/****************************************************************************
- Read a smb readX header.
- We can only use this if encryption and signing are off.
-****************************************************************************/
-
-bool cli_receive_smb_readX_header(struct cli_state *cli)
-{
-       ssize_t len, offset;
-
-       if (cli->fd == -1)
-               return false; 
-
- again:
-
-       /* Read up to the size of a readX header reply. */
-       len = client_receive_smb(cli, (smb_size - 4) + 24);
-       
-       if (len > 0) {
-               /* it might be an oplock break request */
-               if (!(CVAL(cli->inbuf, smb_flg) & FLAG_REPLY) &&
-                   CVAL(cli->inbuf,smb_com) == SMBlockingX &&
-                   SVAL(cli->inbuf,smb_vwv6) == 0 &&
-                   SVAL(cli->inbuf,smb_vwv7) == 0) {
-                       ssize_t total_len = smb_len(cli->inbuf);
-
-                       if (total_len > CLI_SAMBA_MAX_LARGE_READX_SIZE+SAFETY_MARGIN) {
-                               goto read_err;
-                       }
-
-                       /* Read the rest of the data. */
-                       if ((total_len - len > 0) &&
-                           !cli_receive_smb_data(cli,cli->inbuf+len,total_len - len)) {
-                               goto read_err;
-                       }
-
-                       if (cli->oplock_handler) {
-                               int fnum = SVAL(cli->inbuf,smb_vwv2);
-                               unsigned char level = CVAL(cli->inbuf,smb_vwv3+1);
-                               if (!cli->oplock_handler(cli, fnum, level)) return false;
-                       }
-                       /* try to prevent loops */
-                       SCVAL(cli->inbuf,smb_com,0xFF);
-                       goto again;
-               }
-       }
-
-       /* If it's not the above size it probably was an error packet. */
-
-       if ((len == (smb_size - 4) + 24) && !cli_is_error(cli)) {
-               /* Check it's a non-chained readX reply. */
-               if (!(CVAL(cli->inbuf, smb_flg) & FLAG_REPLY) ||
-                       (CVAL(cli->inbuf,smb_vwv0) != 0xFF) ||
-                       (CVAL(cli->inbuf,smb_com) != SMBreadX)) {
-                       /* 
-                        * We're not coping here with asnyc replies to
-                        * other calls. Punt here - we need async client
-                        * libs for this.
-                        */
-                       goto read_err;
-               }
-
-               /* 
-                * We know it's a readX reply - ensure we've read the
-                * padding bytes also.
-                */
-
-               offset = SVAL(cli->inbuf,smb_vwv6);
-               if (offset > len) {
-                       ssize_t ret;
-                       size_t padbytes = offset - len;
-                       ret = cli_receive_smb_data(cli,smb_buf(cli->inbuf),padbytes);
-                       if (ret != padbytes) {
-                               goto read_err;
-                       }
-               }
-       }
-
-       return true;
-
-  read_err:
-
-       cli->smb_rw_error = SMB_READ_ERROR;
-       close(cli->fd);
-       cli->fd = -1;
        return false;
 }
 
-static ssize_t write_socket(int fd, const char *buf, size_t len)
-{
-        ssize_t ret=0;
-
-        DEBUG(6,("write_socket(%d,%d)\n",fd,(int)len));
-        ret = write_data(fd,buf,len);
-
-        DEBUG(6,("write_socket(%d,%d) wrote %d\n",fd,(int)len,(int)ret));
-        if(ret <= 0)
-                DEBUG(0,("write_socket: Error writing %d bytes to socket %d: ERRNO = %s\n",
-                        (int)len, fd, strerror(errno) ));
-
-        return(ret);
-}
-
-/****************************************************************************
- Send an smb to a fd.
-****************************************************************************/
-
-bool cli_send_smb(struct cli_state *cli)
+bool cli_state_seqnum_remove(struct cli_state *cli,
+                            uint16_t mid)
 {
-       size_t len;
-       size_t nwritten=0;
-       ssize_t ret;
-       char *buf_out = cli->outbuf;
-       bool enc_on = cli_encryption_on(cli);
-
-       /* fd == -1 causes segfaults -- Tom (tom@ninja.nl) */
-       if (cli->fd == -1)
-               return false;
-
-       cli_calculate_sign_mac(cli, cli->outbuf);
-
-       if (enc_on) {
-               NTSTATUS status = cli_encrypt_message(cli, cli->outbuf,
-                                                     &buf_out);
-               if (!NT_STATUS_IS_OK(status)) {
-                       close(cli->fd);
-                       cli->fd = -1;
-                       cli->smb_rw_error = SMB_WRITE_ERROR;
-                       DEBUG(0,("Error in encrypting client message. Error %s\n",
-                               nt_errstr(status) ));
-                       return false;
-               }
-       }
-
-       len = smb_len(buf_out) + 4;
-
-       while (nwritten < len) {
-               ret = write_socket(cli->fd,buf_out+nwritten,len - nwritten);
-               if (ret <= 0) {
-                       if (enc_on) {
-                               cli_free_enc_buffer(cli, buf_out);
-                       }
-                       close(cli->fd);
-                       cli->fd = -1;
-                       cli->smb_rw_error = SMB_WRITE_ERROR;
-                       DEBUG(0,("Error writing %d bytes to client. %d (%s)\n",
-                               (int)len,(int)ret, strerror(errno) ));
-                       return false;
-               }
-               nwritten += ret;
-       }
-
-       if (enc_on) {
-               cli_free_enc_buffer(cli, buf_out);
-       }
-
-       /* Increment the mid so we can tell between responses. */
-       cli->mid++;
-       if (!cli->mid)
-               cli->mid++;
-       return true;
-}
+       struct cli_state_seqnum *c;
 
-/****************************************************************************
- Send a "direct" writeX smb to a fd.
-****************************************************************************/
-
-bool cli_send_smb_direct_writeX(struct cli_state *cli,
-                               const char *p,
-                               size_t extradata)
-{
-       /* First length to send is the offset to the data. */
-       size_t len = SVAL(cli->outbuf,smb_vwv11) + 4;
-       size_t nwritten=0;
-       ssize_t ret;
-
-       /* fd == -1 causes segfaults -- Tom (tom@ninja.nl) */
-       if (cli->fd == -1) {
-               return false;
-       }
-
-       if (client_is_signing_on(cli)) {
-               DEBUG(0,("cli_send_smb_large: cannot send signed packet.\n"));
-               return false;
-       }
-
-       while (nwritten < len) {
-               ret = write_socket(cli->fd,cli->outbuf+nwritten,len - nwritten);
-               if (ret <= 0) {
-                       close(cli->fd);
-                       cli->fd = -1;
-                       cli->smb_rw_error = SMB_WRITE_ERROR;
-                       DEBUG(0,("Error writing %d bytes to client. %d (%s)\n",
-                               (int)len,(int)ret, strerror(errno) ));
-                       return false;
-               }
-               nwritten += ret;
-       }
-
-       /* Now write the extra data. */
-       nwritten=0;
-       while (nwritten < extradata) {
-               ret = write_socket(cli->fd,p+nwritten,extradata - nwritten);
-               if (ret <= 0) {
-                       close(cli->fd);
-                       cli->fd = -1;
-                       cli->smb_rw_error = SMB_WRITE_ERROR;
-                       DEBUG(0,("Error writing %d extradata "
-                               "bytes to client. %d (%s)\n",
-                               (int)extradata,(int)ret, strerror(errno) ));
-                       return false;
+       for (c = cli->seqnum; c; c = c->next) {
+               if (c->mid == mid) {
+                       DLIST_REMOVE(cli->seqnum, c);
+                       TALLOC_FREE(c);
+                       return true;
                }
-               nwritten += ret;
        }
 
-       /* Increment the mid so we can tell between responses. */
-       cli->mid++;
-       if (!cli->mid)
-               cli->mid++;
-       return true;
+       return false;
 }
 
 /****************************************************************************
@@ -482,64 +135,77 @@ void cli_setup_packet_buf(struct cli_state *cli, char *buf)
        SSVAL(buf,smb_flg2, flags2);
 }
 
-void cli_setup_packet(struct cli_state *cli)
-{
-       cli_setup_packet_buf(cli, cli->outbuf);
-}
-
 /****************************************************************************
Setup the bcc length of the packet from a pointer to the end of the data.
Initialize Domain, user or password.
 ****************************************************************************/
 
-void cli_setup_bcc(struct cli_state *cli, void *p)
+NTSTATUS cli_set_domain(struct cli_state *cli, const char *domain)
 {
-       set_message_bcc(cli->outbuf, PTR_DIFF(p, smb_buf(cli->outbuf)));
+       TALLOC_FREE(cli->domain);
+       cli->domain = talloc_strdup(cli, domain ? domain : "");
+       if (cli->domain == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       return NT_STATUS_OK;
 }
 
-/****************************************************************************
- Initialise credentials of a client structure.
-****************************************************************************/
+NTSTATUS cli_set_username(struct cli_state *cli, const char *username)
+{
+       TALLOC_FREE(cli->user_name);
+       cli->user_name = talloc_strdup(cli, username ? username : "");
+       if (cli->user_name == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       return NT_STATUS_OK;
+}
 
-void cli_init_creds(struct cli_state *cli, const char *username, const char *domain, const char *password)
+NTSTATUS cli_set_password(struct cli_state *cli, const char *password)
 {
-       fstrcpy(cli->domain, domain);
-       fstrcpy(cli->user_name, username);
-       pwd_set_cleartext(&cli->pwd, password);
-       if (!*username) {
-               cli->pwd.null_pwd = true;
+       TALLOC_FREE(cli->password);
+
+       /* Password can be NULL. */
+       if (password) {
+               cli->password = talloc_strdup(cli, password);
+               if (cli->password == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+       } else {
+               /* Use zero NTLMSSP hashes and session key. */
+               cli->password = NULL;
        }
 
-        DEBUG(10,("cli_init_creds: user %s domain %s\n", cli->user_name, cli->domain));
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
Set the signing state (used from the command line).
Initialise credentials of a client structure.
 ****************************************************************************/
 
-void cli_setup_signing_state(struct cli_state *cli, int signing_state)
+NTSTATUS cli_init_creds(struct cli_state *cli, const char *username, const char *domain, const char *password)
 {
-       if (signing_state == Undefined)
-               return;
-
-       if (signing_state == false) {
-               cli->sign_info.allow_smb_signing = false;
-               cli->sign_info.mandatory_signing = false;
-               return;
+       NTSTATUS status = cli_set_username(cli, username);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
+       status = cli_set_domain(cli, domain);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+       DEBUG(10,("cli_init_creds: user %s domain %s\n", cli->user_name, cli->domain));
 
-       cli->sign_info.allow_smb_signing = true;
-
-       if (signing_state == Required) 
-               cli->sign_info.mandatory_signing = true;
+       return cli_set_password(cli, password);
 }
 
 /****************************************************************************
- Initialise a client structure. Always returns a malloc'ed struct.
+ Initialise a client structure. Always returns a talloc'ed struct.
+ Set the signing state (used from the command line).
 ****************************************************************************/
 
-struct cli_state *cli_initialise(void)
+struct cli_state *cli_initialise_ex(int signing_state)
 {
        struct cli_state *cli = NULL;
+       bool allow_smb_signing = false;
+       bool mandatory_signing = false;
 
        /* Check the effective uid - make sure we are not setuid */
        if (is_setuid_root()) {
@@ -547,13 +213,15 @@ struct cli_state *cli_initialise(void)
                return NULL;
        }
 
-       cli = talloc(NULL, struct cli_state);
+       cli = talloc_zero(NULL, struct cli_state);
        if (!cli) {
                return NULL;
        }
 
-       ZERO_STRUCTP(cli);
-
+       cli->dfs_mountpoint = talloc_strdup(cli, "");
+       if (!cli->dfs_mountpoint) {
+               goto error;
+       }
        cli->port = 0;
        cli->fd = -1;
        cli->cnum = -1;
@@ -565,6 +233,7 @@ struct cli_state *cli_initialise(void)
        cli->bufsize = CLI_BUFFER_SIZE+4;
        cli->max_xmit = cli->bufsize;
        cli->outbuf = (char *)SMB_MALLOC(cli->bufsize+SAFETY_MARGIN);
+       cli->seqnum = 0;
        cli->inbuf = (char *)SMB_MALLOC(cli->bufsize+SAFETY_MARGIN);
        cli->oplock_handler = cli_oplock_ack;
        cli->case_sensitive = false;
@@ -580,27 +249,46 @@ struct cli_state *cli_initialise(void)
        if (getenv("CLI_FORCE_DOSERR"))
                cli->force_dos_errors = true;
 
-       if (lp_client_signing()) 
-               cli->sign_info.allow_smb_signing = true;
+       if (lp_client_signing()) {
+               allow_smb_signing = true;
+       }
+
+       if (lp_client_signing() == Required) {
+               mandatory_signing = true;
+       }
+
+       if (signing_state != Undefined) {
+               allow_smb_signing = true;
+       }
+
+       if (signing_state == false) {
+               allow_smb_signing = false;
+               mandatory_signing = false;
+       }
+
+       if (signing_state == Required) {
+               mandatory_signing = true;
+       }
 
-       if (lp_client_signing() == Required) 
-               cli->sign_info.mandatory_signing = true;
-                                   
        if (!cli->outbuf || !cli->inbuf)
                 goto error;
 
        memset(cli->outbuf, 0, cli->bufsize);
        memset(cli->inbuf, 0, cli->bufsize);
 
-
-#if defined(DEVELOPER)
-       /* just because we over-allocate, doesn't mean it's right to use it */
-       clobber_region(FUNCTION_MACRO, __LINE__, cli->outbuf+cli->bufsize, SAFETY_MARGIN);
-       clobber_region(FUNCTION_MACRO, __LINE__, cli->inbuf+cli->bufsize, SAFETY_MARGIN);
-#endif
-
        /* initialise signing */
-       cli_null_set_signing(cli);
+       cli->signing_state = smb_signing_init(cli,
+                                             allow_smb_signing,
+                                             mandatory_signing);
+       if (!cli->signing_state) {
+               goto error;
+       }
+
+       cli->outgoing = tevent_queue_create(cli, "cli_outgoing");
+       if (cli->outgoing == NULL) {
+               goto error;
+       }
+       cli->pending = NULL;
 
        cli->initialised = 1;
 
@@ -612,46 +300,13 @@ struct cli_state *cli_initialise(void)
 
         SAFE_FREE(cli->inbuf);
         SAFE_FREE(cli->outbuf);
-       SAFE_FREE(cli);
+       TALLOC_FREE(cli);
         return NULL;
 }
 
-/****************************************************************************
- External interface.
- Close an open named pipe over SMB. Free any authentication data.
- Returns false if the cli_close call failed.
- ****************************************************************************/
-
-bool cli_rpc_pipe_close(struct rpc_pipe_client *cli)
+struct cli_state *cli_initialise(void)
 {
-       bool ret;
-
-       if (!cli) {
-               return false;
-       }
-
-       ret = cli_close(cli->cli, cli->fnum);
-
-       if (!ret) {
-               DEBUG(1,("cli_rpc_pipe_close: cli_close failed on pipe %s, "
-                         "fnum 0x%x "
-                         "to machine %s.  Error was %s\n",
-                         cli->pipe_name,
-                         (int) cli->fnum,
-                         cli->cli->desthost,
-                         cli_errstr(cli->cli)));
-       }
-
-       if (cli->auth.cli_auth_data_free_func) {
-               (*cli->auth.cli_auth_data_free_func)(&cli->auth);
-       }
-
-       DEBUG(10,("cli_rpc_pipe_close: closed pipe %s to machine %s\n",
-               cli->pipe_name, cli->cli->desthost ));
-
-       DLIST_REMOVE(cli->cli->pipe_list, cli);
-       talloc_destroy(cli->mem_ctx);
-       return ret;
+       return cli_initialise_ex(Undefined);
 }
 
 /****************************************************************************
@@ -660,11 +315,11 @@ bool cli_rpc_pipe_close(struct rpc_pipe_client *cli)
 
 void cli_nt_pipes_close(struct cli_state *cli)
 {
-       struct rpc_pipe_client *cp, *next;
-
-       for (cp = cli->pipe_list; cp; cp = next) {
-               next = cp->next;
-               cli_rpc_pipe_close(cp);
+       while (cli->pipe_list != NULL) {
+               /*
+                * No TALLOC_FREE here!
+                */
+               talloc_free(cli->pipe_list);
        }
 }
 
@@ -672,7 +327,7 @@ void cli_nt_pipes_close(struct cli_state *cli)
  Shutdown a client structure.
 ****************************************************************************/
 
-void cli_shutdown(struct cli_state *cli)
+static void _cli_shutdown(struct cli_state *cli)
 {
        cli_nt_pipes_close(cli);
 
@@ -695,7 +350,6 @@ void cli_shutdown(struct cli_state *cli)
        SAFE_FREE(cli->outbuf);
        SAFE_FREE(cli->inbuf);
 
-       cli_free_signing_context(cli);
        data_blob_free(&cli->secblob);
        data_blob_free(&cli->user_session_key);
 
@@ -705,9 +359,41 @@ void cli_shutdown(struct cli_state *cli)
        cli->fd = -1;
        cli->smb_rw_error = SMB_READ_OK;
 
+       /*
+        * Need to free pending first, they remove themselves
+        */
+       while (cli->pending) {
+               talloc_free(cli->pending[0]);
+       }
        TALLOC_FREE(cli);
 }
 
+void cli_shutdown(struct cli_state *cli)
+{
+       struct cli_state *cli_head;
+       if (cli == NULL) {
+               return;
+       }
+       DLIST_HEAD(cli, cli_head);
+       if (cli_head == cli) {
+               /*
+                * head of a DFS list, shutdown all subsidiary DFS
+                * connections.
+                */
+               struct cli_state *p, *next;
+
+               for (p = cli_head->next; p; p = next) {
+                       next = p->next;
+                       DLIST_REMOVE(cli_head, p);
+                       _cli_shutdown(p);
+               }
+       } else {
+               DLIST_REMOVE(cli_head, cli);
+       }
+
+       _cli_shutdown(cli);
+}
+
 /****************************************************************************
  Set socket options on a open connection.
 ****************************************************************************/
@@ -739,60 +425,196 @@ bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive)
        return ret;
 }
 
-/****************************************************************************
-Send a keepalive packet to the server
-****************************************************************************/
+struct cli_echo_state {
+       uint16_t vwv[1];
+       DATA_BLOB data;
+       int num_echos;
+};
+
+static void cli_echo_done(struct tevent_req *subreq);
 
-bool cli_send_keepalive(struct cli_state *cli)
+struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+                                struct cli_state *cli, uint16_t num_echos,
+                                DATA_BLOB data)
 {
-        if (cli->fd == -1) {
-                DEBUG(3, ("cli_send_keepalive: fd == -1\n"));
-                return false;
-        }
-        if (!send_keepalive(cli->fd)) {
-                close(cli->fd);
-                cli->fd = -1;
-                DEBUG(0,("Error sending keepalive packet to client.\n"));
-                return false;
-        }
-        return true;
+       struct tevent_req *req, *subreq;
+       struct cli_echo_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct cli_echo_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       SSVAL(state->vwv, 0, num_echos);
+       state->data = data;
+       state->num_echos = num_echos;
+
+       subreq = cli_smb_send(state, ev, cli, SMBecho, 0, 1, state->vwv,
+                             data.length, data.data);
+       if (subreq == NULL) {
+               goto fail;
+       }
+       tevent_req_set_callback(subreq, cli_echo_done, req);
+       return req;
+ fail:
+       TALLOC_FREE(req);
+       return NULL;
 }
 
-/****************************************************************************
- Send/receive a SMBecho command: ping the server
-****************************************************************************/
+static void cli_echo_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_echo_state *state = tevent_req_data(
+               req, struct cli_echo_state);
+       NTSTATUS status;
+       uint32_t num_bytes;
+       uint8_t *bytes;
+       uint8_t *inbuf;
+
+       status = cli_smb_recv(subreq, state, &inbuf, 0, NULL, NULL,
+                             &num_bytes, &bytes);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+       if ((num_bytes != state->data.length)
+           || (memcmp(bytes, state->data.data, num_bytes) != 0)) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       state->num_echos -=1;
+       if (state->num_echos == 0) {
+               tevent_req_done(req);
+               return;
+       }
+
+       if (!cli_smb_req_set_pending(subreq)) {
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
+}
+
+/**
+ * Get the result out from an echo request
+ * @param[in] req      The async_req from cli_echo_send
+ * @retval Did the server reply correctly?
+ */
 
-bool cli_echo(struct cli_state *cli, uint16 num_echos,
-             unsigned char *data, size_t length)
+NTSTATUS cli_echo_recv(struct tevent_req *req)
 {
-       char *p;
-       int i;
+       return tevent_req_simple_recv_ntstatus(req);
+}
 
-       SMB_ASSERT(length < 1024);
+/**
+ * @brief Send/Receive SMBEcho requests
+ * @param[in] mem_ctx  The memory context to put the async_req on
+ * @param[in] ev       The event context that will call us back
+ * @param[in] cli      The connection to send the echo to
+ * @param[in] num_echos        How many times do we want to get the reply?
+ * @param[in] data     The data we want to get back
+ * @retval Did the server reply correctly?
+ */
+
+NTSTATUS cli_echo(struct cli_state *cli, uint16_t num_echos, DATA_BLOB data)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct event_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_OK;
 
-       memset(cli->outbuf,'\0',smb_size);
-       cli_set_message(cli->outbuf,1,length,true);
-       SCVAL(cli->outbuf,smb_com,SMBecho);
-       SSVAL(cli->outbuf,smb_tid,65535);
-       SSVAL(cli->outbuf,smb_vwv0,num_echos);
-       cli_setup_packet(cli);
-       p = smb_buf(cli->outbuf);
-       memcpy(p, data, length);
-       p += length;
+       if (cli_has_async_calls(cli)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
 
-       cli_setup_bcc(cli, p);
+       ev = event_context_init(frame);
+       if (ev == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
 
-       cli_send_smb(cli);
+       req = cli_echo_send(frame, ev, cli, num_echos, data);
+       if (req == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
 
-       for (i=0; i<num_echos; i++) {
-               if (!cli_receive_smb(cli)) {
-                       return false;
-               }
+       if (!tevent_req_poll(req, ev)) {
+               status = map_nt_error_from_unix(errno);
+               goto fail;
+       }
 
-               if (cli_is_error(cli)) {
-                       return false;
-               }
+       status = cli_echo_recv(req);
+ fail:
+       TALLOC_FREE(frame);
+       if (!NT_STATUS_IS_OK(status)) {
+               cli_set_error(cli, status);
+       }
+       return status;
+}
+
+/**
+ * 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"?
+ */
+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 true;
+       return false;
+}
+
+NTSTATUS cli_smb(TALLOC_CTX *mem_ctx, 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 **result_parent,
+                uint8_t min_wct, uint8_t *pwct, uint16_t **pvwv,
+                uint32_t *pnum_bytes, uint8_t **pbytes)
+{
+        struct tevent_context *ev;
+        struct tevent_req *req = NULL;
+        NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+        if (cli_has_async_calls(cli)) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+        ev = tevent_context_init(mem_ctx);
+        if (ev == NULL) {
+                goto fail;
+        }
+        req = cli_smb_send(mem_ctx, ev, cli, smb_command, additional_flags,
+                          wct, vwv, num_bytes, bytes);
+        if (req == NULL) {
+                goto fail;
+        }
+        if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+                goto fail;
+        }
+        status = cli_smb_recv(req, NULL, NULL, min_wct, pwct, pvwv,
+                             pnum_bytes, pbytes);
+fail:
+        TALLOC_FREE(ev);
+       if (NT_STATUS_IS_OK(status) && (result_parent != NULL)) {
+               *result_parent = req;
+       }
+        return status;
 }