diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-07-23 22:32:49 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-07-24 22:20:06 +0200 |
| commit | 86a5ab731be6eb0fec7eb85a3ae4660bf8576c6d (patch) | |
| tree | 6d67fe0811728c966a678a93dcada19313b6c6bd /libcli | |
| parent | 697b82a61979b48de86d74d2bf5c498032ff49b1 (diff) | |
| download | samba-86a5ab731be6eb0fec7eb85a3ae4660bf8576c6d.tar.gz | |
libcli/smb: pass smbXcli_tcon to smb2cli_write*()
metze
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/smb/smb2cli_write.c | 14 | ||||
| -rw-r--r-- | libcli/smb/smbXcli_base.h | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libcli/smb/smb2cli_write.c b/libcli/smb/smb2cli_write.c index 2850cea3981..cd98e5e723b 100644 --- a/libcli/smb/smb2cli_write.c +++ b/libcli/smb/smb2cli_write.c @@ -35,7 +35,7 @@ struct tevent_req *smb2cli_write_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, uint32_t length, uint64_t offset, uint64_t fid_persistent, @@ -49,6 +49,7 @@ struct tevent_req *smb2cli_write_send(TALLOC_CTX *mem_ctx, uint8_t *fixed; const uint8_t *dyn; size_t dyn_len; + uint32_t tcon_id = 0; req = tevent_req_create(mem_ctx, &state, struct smb2cli_write_state); @@ -75,6 +76,10 @@ struct tevent_req *smb2cli_write_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_WRITE, 0, 0, /* flags */ timeout_msec, @@ -119,7 +124,7 @@ NTSTATUS smb2cli_write_recv(struct tevent_req *req) NTSTATUS smb2cli_write(struct smbXcli_conn *conn, uint32_t timeout_msec, struct smbXcli_session *session, - uint32_t tcon_id, + struct smbXcli_tcon *tcon, uint32_t length, uint64_t offset, uint64_t fid_persistent, @@ -144,8 +149,9 @@ NTSTATUS smb2cli_write(struct smbXcli_conn *conn, if (ev == NULL) { goto fail; } - req = smb2cli_write_send(frame, ev, conn, timeout_msec, session, - tcon_id, length, offset, + req = smb2cli_write_send(frame, ev, conn, timeout_msec, + session, tcon, + length, offset, fid_persistent, fid_volatile, remaining_bytes, flags, data); if (req == NULL) { diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 7aefffc85d1..8e90cde6e6e 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -402,7 +402,7 @@ struct tevent_req *smb2cli_write_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, uint32_t length, uint64_t offset, uint64_t fid_persistent, @@ -414,7 +414,7 @@ NTSTATUS smb2cli_write_recv(struct tevent_req *req); NTSTATUS smb2cli_write(struct smbXcli_conn *conn, uint32_t timeout_msec, struct smbXcli_session *session, - uint32_t tcon_id, + struct smbXcli_tcon *tcon, uint32_t length, uint64_t offset, uint64_t fid_persistent, |