diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-07-23 21:34:58 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-07-24 21:22:44 +0200 |
| commit | b9100a7ac443159716398aaadfab34af64d8858b (patch) | |
| tree | 7148b0a41ec094b19e27b2ee85b18cded4f88254 /libcli/smb/smb1cli_trans.c | |
| parent | 29dc01b1755081b1b7a9b38ad4f7e6fdaa795bf9 (diff) | |
| download | samba-b9100a7ac443159716398aaadfab34af64d8858b.tar.gz samba-b9100a7ac443159716398aaadfab34af64d8858b.tar.bz2 samba-b9100a7ac443159716398aaadfab34af64d8858b.zip | |
libcli/smb: pass down smbXcli_tcon to smb1cli_req_create/send() and smb1cli_trans*
metze
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Jul 24 21:22:44 CEST 2012 on sn-devel-104
Diffstat (limited to 'libcli/smb/smb1cli_trans.c')
| -rw-r--r-- | libcli/smb/smb1cli_trans.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libcli/smb/smb1cli_trans.c b/libcli/smb/smb1cli_trans.c index ca0fdc157d..cc4f7d3b91 100644 --- a/libcli/smb/smb1cli_trans.c +++ b/libcli/smb/smb1cli_trans.c @@ -39,7 +39,7 @@ struct smb1cli_trans_state { uint32_t timeout_msec; uint16_t mid; uint32_t pid; - uint16_t tid; + struct smbXcli_tcon *tcon; struct smbXcli_session *session; const char *pipe_name; uint8_t *pipe_name_conv; @@ -415,7 +415,8 @@ struct tevent_req *smb1cli_trans_send( uint8_t additional_flags, uint8_t clear_flags, uint16_t additional_flags2, uint16_t clear_flags2, uint32_t timeout_msec, - uint32_t pid, uint16_t tid, + uint32_t pid, + struct smbXcli_tcon *tcon, struct smbXcli_session *session, const char *pipe_name, uint16_t fid, uint16_t function, int flags, uint16_t *setup, uint8_t num_setup, uint8_t max_setup, @@ -470,7 +471,7 @@ struct tevent_req *smb1cli_trans_send( state->num_rsetup = 0; state->rsetup = NULL; state->pid = pid; - state->tid = tid; + state->tcon = tcon; state->session = session; ZERO_STRUCT(state->rparam); ZERO_STRUCT(state->rdata); @@ -514,7 +515,8 @@ struct tevent_req *smb1cli_trans_send( state->additional_flags2, state->clear_flags2, state->timeout_msec, - state->pid, state->tid, + state->pid, + state->tcon, state->session, wct, state->vwv, iov_count, state->iov); @@ -646,7 +648,8 @@ static void smb1cli_trans_done(struct tevent_req *subreq) state->additional_flags2, state->clear_flags2, state->timeout_msec, - state->pid, state->tid, + state->pid, + state->tcon, state->session, wct, state->vwv, iov_count, state->iov); @@ -753,7 +756,8 @@ static void smb1cli_trans_done2(struct tevent_req *subreq2) state->additional_flags2, state->clear_flags2, state->timeout_msec, - state->pid, state->tid, + state->pid, + state->tcon, state->session, wct, state->vwv, iov_count, state->iov); @@ -844,7 +848,8 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn, uint8_t additional_flags, uint8_t clear_flags, uint16_t additional_flags2, uint16_t clear_flags2, uint32_t timeout_msec, - uint32_t pid, uint16_t tid, + uint32_t pid, + struct smbXcli_tcon *tcon, struct smbXcli_session *session, const char *pipe_name, uint16_t fid, uint16_t function, int flags, @@ -879,7 +884,7 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn, additional_flags, clear_flags, additional_flags2, clear_flags2, timeout_msec, - pid, tid, session, + pid, tcon, session, pipe_name, fid, function, flags, setup, num_setup, max_setup, param, num_param, max_param, |