Clean up client timeout definitions [rev. 2]

[kai/samba.git] / source3 / libsmb / clientgen.c

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 88cb44da57f631e7b2b1d5b61c19e1ef7ebf552c..98ea7113a29b531e92a9d12a9eea8122f8c42a9f 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -26,6 +26,7 @@
 #include "async_smb.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "../librpc/ndr/libndr.h"
+#include "../include/client.h"
 
 /*******************************************************************
  Setup the word count and byte count for a client smb message.
@@ -175,7 +176,7 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
        }
        cli->raw_status = NT_STATUS_INTERNAL_ERROR;
        cli->map_dos_errors = true; /* remove this */
-       cli->timeout = 20000; /* Timeout is in milliseconds. */
+       cli->timeout = CLIENT_TIMEOUT;
        cli->case_sensitive = false;
 
        /* Set the CLI_FORCE_DOSERR environment variable to test
@@ -271,7 +272,11 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 
        cli->smb1.pid = (uint16_t)getpid();
        cli->smb1.vc_num = cli->smb1.pid;
-       cli->smb1.tid = UINT16_MAX;
+       cli->smb1.tcon = smbXcli_tcon_create(cli);
+       if (cli->smb1.tcon == NULL) {
+               goto error;
+       }
+       smb1cli_tcon_set_id(cli->smb1.tcon, UINT16_MAX);
        cli->smb1.session = smbXcli_session_create(cli, cli->conn);
        if (cli->smb1.session == NULL) {
                goto error;
@@ -321,8 +326,6 @@ static void _cli_shutdown(struct cli_state *cli)
        if (cli_state_has_tcon(cli)) {
                cli_tdis(cli);
        }
-        
-       data_blob_free(&cli->user_session_key);
 
        smbXcli_conn_disconnect(cli->conn, NT_STATUS_OK);
 
@@ -383,7 +386,9 @@ uint16_t cli_getpid(struct cli_state *cli)
 
 bool cli_state_has_tcon(struct cli_state *cli)
 {
-       if (cli->smb1.tid == UINT16_MAX) {
+       uint16_t tid = cli_state_get_tid(cli);
+
+       if (tid == UINT16_MAX) {
                return false;
        }
 
@@ -392,13 +397,13 @@ bool cli_state_has_tcon(struct cli_state *cli)
 
 uint16_t cli_state_get_tid(struct cli_state *cli)
 {
-       return cli->smb1.tid;
+       return smb1cli_tcon_current_id(cli->smb1.tcon);
 }
 
 uint16_t cli_state_set_tid(struct cli_state *cli, uint16_t tid)
 {
-       uint16_t ret = cli->smb1.tid;
-       cli->smb1.tid = tid;
+       uint16_t ret = smb1cli_tcon_current_id(cli->smb1.tcon);
+       smb1cli_tcon_set_id(cli->smb1.tcon, tid);
        return ret;
 }
 
@@ -450,9 +455,7 @@ time_t cli_state_server_time(struct cli_state *cli)
 }
 
 struct cli_echo_state {
-       uint16_t vwv[1];
-       DATA_BLOB data;
-       int num_echos;
+       bool is_smb2;
 };
 
 static void cli_echo_done(struct tevent_req *subreq);
@@ -468,20 +471,25 @@ struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
        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;
+       if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+               state->is_smb2 = true;
+               subreq = smb2cli_echo_send(state, ev,
+                                          cli->conn,
+                                          cli->timeout);
+       } else {
+               subreq = smb1cli_echo_send(state, ev,
+                                          cli->conn,
+                                          cli->timeout,
+                                          num_echos,
+                                          data);
+       }
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
        }
        tevent_req_set_callback(subreq, cli_echo_done, req);
+
        return req;
- fail:
-       TALLOC_FREE(req);
-       return NULL;
 }
 
 static void cli_echo_done(struct tevent_req *subreq)
@@ -491,31 +499,19 @@ static void cli_echo_done(struct tevent_req *subreq)
        struct cli_echo_state *state = tevent_req_data(
                req, struct cli_echo_state);
        NTSTATUS status;
-       uint32_t num_bytes;
-       uint8_t *bytes;
 
-       status = cli_smb_recv(subreq, state, NULL, 0, NULL, NULL,
-                             &num_bytes, &bytes);
+       if (state->is_smb2) {
+               status = smb2cli_echo_recv(subreq);
+       } else {
+               status = smb1cli_echo_recv(subreq);
+       }
+       TALLOC_FREE(subreq);
        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 (!smbXcli_req_set_pending(subreq)) {
-               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
-               return;
-       }
+       tevent_req_done(req);
 }
 
 /**