s3:libsmb: make use of cli_state_[g|s]et_tid()

metze

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index a82b0ced72a0bc3b3cf10d4ad0052e58cd3f2fd4..9704ea59a9b13ff42f524e499a7ff53cfad300c7 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -62,6 +62,7 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
        uint8_t clear_flags = 0;
        uint16_t additional_flags2 = 0;
        uint16_t clear_flags2 = 0;
+       uint16_t tid = 0;
 
        state = talloc_zero(mem_ctx, struct cli_smb_req_state);
        if (state == NULL) {
@@ -87,12 +88,13 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
                additional_flags2 |= FLAGS2_DFS_PATHNAMES;
        }
 
+       tid = cli_state_get_tid(cli);
        state->req = smb1cli_req_create(state, ev, cli->conn, smb_command,
                                        additional_flags, clear_flags,
                                        additional_flags2, clear_flags2,
                                        cli->timeout,
                                        cli->smb1.pid,
-                                       cli->smb1.tid,
+                                       tid,
                                        cli->smb1.session,
                                        wct, vwv, iov_count, bytes_iov);
        if (state->req == NULL) {
@@ -120,6 +122,7 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx,
        uint8_t clear_flags = 0;
        uint16_t additional_flags2 = 0;
        uint16_t clear_flags2 = 0;
+       uint16_t tid = 0;
 
        state = talloc_zero(mem_ctx, struct cli_smb_req_state);
        if (state == NULL) {
@@ -145,12 +148,13 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx,
                additional_flags2 |= FLAGS2_DFS_PATHNAMES;
        }
 
+       tid = cli_state_get_tid(cli);
        state->req = smb1cli_req_send(state, ev, cli->conn, smb_command,
                                additional_flags, clear_flags,
                                additional_flags2, clear_flags2,
                                cli->timeout,
                                cli->smb1.pid,
-                               cli->smb1.tid,
+                               tid,
                                cli->smb1.session,
                                wct, vwv, num_bytes, bytes);
        if (state->req == NULL) {

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index acc3a21c744b7c70c307c718c0ce3be412937b13..17b5af679fa4079c854feb89531697ae10c70589 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2469,7 +2469,7 @@ static void cli_tcon_andx_done(struct tevent_req *subreq)
                cli->dfsroot = ((SVAL(vwv+2, 0) & SMB_SHARE_IN_DFS) != 0);
        }
 
-       cli->smb1.tid = SVAL(inhdr, HDR_TID);
+       cli_state_set_tid(cli, SVAL(inhdr, HDR_TID));
        tevent_req_done(req);
 }
 
@@ -2541,7 +2541,8 @@ NTSTATUS cli_tree_connect(struct cli_state *cli, const char *share,
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
-       cli->smb1.tid = tid;
+
+       cli_state_set_tid(cli, tid);
 
        return NT_STATUS_OK;
 }
@@ -2591,7 +2592,7 @@ static void cli_tdis_done(struct tevent_req *subreq)
                tevent_req_nterror(req, status);
                return;
        }
-       state->cli->smb1.tid = UINT16_MAX;
+       cli_state_set_tid(state->cli, UINT16_MAX);
        tevent_req_done(req);
 }
 

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 88cb44da57f631e7b2b1d5b61c19e1ef7ebf552c..47cb0f30ddeae846f090d6b1fb16e942e41353b9 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -383,7 +383,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;
        }
 

diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 5a27678310d77883318f9dfe0cbf8f33a35fafbb..9755d57254ec3457e1eafc12c81fecaf5c4293bf 100644 (file)
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -61,6 +61,7 @@ struct tevent_req *cli_trans_send(
        uint8_t clear_flags = 0;
        uint16_t additional_flags2 = 0;
        uint16_t clear_flags2 = 0;
+       uint16_t tid = 0;
 
        state = talloc_zero(mem_ctx, struct cli_trans_state);
        if (state == NULL) {
@@ -84,12 +85,13 @@ struct tevent_req *cli_trans_send(
                additional_flags2 |= FLAGS2_DFS_PATHNAMES;
        }
 
+       tid = cli_state_get_tid(cli);
        state->req = smb1cli_trans_send(state, ev,
                                        cli->conn, cmd,
                                        additional_flags, clear_flags,
                                        additional_flags2, clear_flags2,
                                        cli->timeout,
-                                       cli->smb1.pid, cli->smb1.tid,
+                                       cli->smb1.pid, tid,
                                        cli->smb1.session,
                                        pipe_name, fid, function, flags,
                                        setup, num_setup, max_setup,
@@ -167,6 +169,7 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
        uint8_t clear_flags = 0;
        uint16_t additional_flags2 = 0;
        uint16_t clear_flags2 = 0;
+       uint16_t tid = 0;
 
        if (cli->case_sensitive) {
                clear_flags |= FLAG_CASELESS_PATHNAMES;
@@ -179,12 +182,13 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
                additional_flags2 |= FLAGS2_DFS_PATHNAMES;
        }
 
+       tid = cli_state_get_tid(cli);
        status = smb1cli_trans(mem_ctx,
                               cli->conn, trans_cmd,
                               additional_flags, clear_flags,
                               additional_flags2, clear_flags2,
                               cli->timeout,
-                              cli->smb1.pid, cli->smb1.tid,
+                              cli->smb1.pid, tid,
                               cli->smb1.session,
                               pipe_name, fid, function, flags,
                               setup, num_setup, max_setup,