summaryrefslogtreecommitdiff
path: root/source4/libcli/smb2
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-07-25 10:36:27 +0200
committerStefan Metzmacher <metze@samba.org>2012-07-25 12:15:04 +0200
commit7de4ae7f9fbf642899afd8c89d0b3af72155e022 (patch)
tree74d0860ceb0ddc18634d135334fb10e4e4170010 /source4/libcli/smb2
parent57fda88dfb685ca9ba84cda6799efcc2224e242f (diff)
downloadsamba-7de4ae7f9fbf642899afd8c89d0b3af72155e022.tar.gz
samba-7de4ae7f9fbf642899afd8c89d0b3af72155e022.tar.bz2
samba-7de4ae7f9fbf642899afd8c89d0b3af72155e022.zip
libcli/smb: pass smbXcli_tcon to smb2cli_req_create/send()
metze
Diffstat (limited to 'source4/libcli/smb2')
-rw-r--r--source4/libcli/smb2/transport.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index a3845a60cb..423b634765 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -116,7 +116,7 @@ void smb2_transport_send(struct smb2_request *req)
uint32_t additional_flags = IVAL(req->out.hdr, SMB2_HDR_FLAGS);
uint32_t clear_flags = 0;
uint32_t pid = IVAL(req->out.hdr, SMB2_HDR_PID);
- uint32_t tid = IVAL(req->out.hdr, SMB2_HDR_TID);
+ struct smbXcli_tcon *tcon = NULL;
struct smbXcli_session *session = NULL;
bool need_pending_break = false;
size_t hdr_ofs;
@@ -148,7 +148,7 @@ void smb2_transport_send(struct smb2_request *req)
0, /*clear_flags */
0, /* timeout_msec */
0, /* pid */
- 0, /* tid */
+ NULL, /* tcon */
NULL, /* session */
NULL, /* body */
0, /* body_fixed */
@@ -167,6 +167,10 @@ void smb2_transport_send(struct smb2_request *req)
session = req->session->smbXcli;
}
+ if (req->tree) {
+ tcon = req->tree->smbXcli;
+ }
+
if (transport->compound.related) {
additional_flags |= SMB2_HDR_FLAG_CHAINED;
}
@@ -186,7 +190,7 @@ void smb2_transport_send(struct smb2_request *req)
clear_flags,
timeout_msec,
pid,
- tid,
+ tcon,
session,
body.data, body.length,
dyn.data, dyn.length);
@@ -342,7 +346,7 @@ static void smb2_transport_break_handler(struct tevent_req *subreq)
0, /*clear_flags */
0, /* timeout_msec */
0, /* pid */
- 0, /* tid */
+ NULL, /* tcon */
NULL, /* session */
NULL, /* body */
0, /* body_fixed */