summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-07-23 22:32:49 +0200
committerStefan Metzmacher <metze@samba.org>2012-07-24 22:20:06 +0200
commit20d43a1d302ea4d890adaca9cee80ca0549eddc8 (patch)
treebc34b897c1df668dc56678ccd74e00870bf470e9
parent51af8b9600630e2310f0dc2780a06f24b88f3cb5 (diff)
downloadsamba-20d43a1d302ea4d890adaca9cee80ca0549eddc8.tar.gz
samba-20d43a1d302ea4d890adaca9cee80ca0549eddc8.tar.bz2
samba-20d43a1d302ea4d890adaca9cee80ca0549eddc8.zip
libcli/smb: pass smbXcli_tcon to smb2cli_ioctl*()
metze
-rw-r--r--libcli/smb/smb2cli_ioctl.c11
-rw-r--r--libcli/smb/smbXcli_base.h4
-rw-r--r--source3/libsmb/cli_np_tstream.c2
3 files changed, 11 insertions, 6 deletions
diff --git a/libcli/smb/smb2cli_ioctl.c b/libcli/smb/smb2cli_ioctl.c
index 983646981a..03296c69f6 100644
--- a/libcli/smb/smb2cli_ioctl.c
+++ b/libcli/smb/smb2cli_ioctl.c
@@ -41,7 +41,7 @@ struct tevent_req *smb2cli_ioctl_send(TALLOC_CTX *mem_ctx,
struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
- uint32_t tcon_id,
+ struct smbXcli_tcon *tcon,
uint64_t in_fid_persistent,
uint64_t in_fid_volatile,
uint32_t in_ctl_code,
@@ -61,6 +61,7 @@ struct tevent_req *smb2cli_ioctl_send(TALLOC_CTX *mem_ctx,
uint32_t output_buffer_offset = 0;
uint32_t output_buffer_length = 0;
uint32_t pad_length = 0;
+ uint32_t tcon_id = 0;
req = tevent_req_create(mem_ctx, &state,
struct smb2cli_ioctl_state);
@@ -133,6 +134,10 @@ struct tevent_req *smb2cli_ioctl_send(TALLOC_CTX *mem_ctx,
dyn_len = sizeof(state->dyn_pad);
}
+ if (tcon) {
+ tcon_id = smb2cli_tcon_current_id(tcon);
+ }
+
subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_IOCTL,
0, 0, /* flags */
timeout_msec,
@@ -281,7 +286,7 @@ NTSTATUS smb2cli_ioctl_recv(struct tevent_req *req,
NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
- uint32_t tcon_id,
+ struct smbXcli_tcon *tcon,
uint64_t in_fid_persistent,
uint64_t in_fid_volatile,
uint32_t in_ctl_code,
@@ -311,7 +316,7 @@ NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
goto fail;
}
req = smb2cli_ioctl_send(frame, ev, conn, timeout_msec,
- session, tcon_id,
+ session, tcon,
in_fid_persistent,
in_fid_volatile,
in_ctl_code,
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 9230c7ee4e..60ef2727a6 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -532,7 +532,7 @@ struct tevent_req *smb2cli_ioctl_send(TALLOC_CTX *mem_ctx,
struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
- uint32_t tcon_id,
+ struct smbXcli_tcon *tcon,
uint64_t in_fid_persistent,
uint64_t in_fid_volatile,
uint32_t in_ctl_code,
@@ -548,7 +548,7 @@ NTSTATUS smb2cli_ioctl_recv(struct tevent_req *req,
NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
- uint32_t tcon_id,
+ struct smbXcli_tcon *tcon,
uint64_t in_fid_persistent,
uint64_t in_fid_volatile,
uint32_t in_ctl_code,
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c
index 8933bc4210..c7ec664c51 100644
--- a/source3/libsmb/cli_np_tstream.c
+++ b/source3/libsmb/cli_np_tstream.c
@@ -829,7 +829,7 @@ static void tstream_cli_np_readv_trans_start(struct tevent_req *req)
cli_nps->cli->conn,
cli_nps->cli->timeout,
cli_nps->cli->smb2.session,
- cli_nps->cli->smb2.tid,
+ cli_nps->cli->smb2.tcon,
cli_nps->fid_persistent,
cli_nps->fid_volatile,
FSCTL_NAMED_PIPE_READ_WRITE,