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 | 6612c831a3eb62da7766152e597168b9cec9b8fc (patch) | |
| tree | a28202fd96884142b8339944a47d70541965812f /libcli | |
| parent | 86a5ab731be6eb0fec7eb85a3ae4660bf8576c6d (diff) | |
| download | samba-6612c831a3eb62da7766152e597168b9cec9b8fc.tar.gz | |
libcli/smb: pass smbXcli_tcon to smb2cli_flush*()
metze
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/smb/smb2cli_flush.c | 14 | ||||
| -rw-r--r-- | libcli/smb/smbXcli_base.h | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libcli/smb/smb2cli_flush.c b/libcli/smb/smb2cli_flush.c index 64d47c29c7e..ca7a0fe8bab 100644 --- a/libcli/smb/smb2cli_flush.c +++ b/libcli/smb/smb2cli_flush.c @@ -34,13 +34,14 @@ struct tevent_req *smb2cli_flush_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 fid_persistent, uint64_t fid_volatile) { struct tevent_req *req, *subreq; struct smb2cli_flush_state *state; uint8_t *fixed; + uint32_t tcon_id = 0; req = tevent_req_create(mem_ctx, &state, struct smb2cli_flush_state); @@ -52,6 +53,10 @@ struct tevent_req *smb2cli_flush_send(TALLOC_CTX *mem_ctx, SBVAL(fixed, 8, fid_persistent); SBVAL(fixed, 16, fid_volatile); + if (tcon) { + tcon_id = smb2cli_tcon_current_id(tcon); + } + subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_FLUSH, 0, 0, /* flags */ timeout_msec, @@ -96,7 +101,7 @@ NTSTATUS smb2cli_flush_recv(struct tevent_req *req) NTSTATUS smb2cli_flush(struct smbXcli_conn *conn, uint32_t timeout_msec, struct smbXcli_session *session, - uint32_t tcon_id, + struct smbXcli_tcon *tcon, uint64_t fid_persistent, uint64_t fid_volatile) { @@ -116,8 +121,9 @@ NTSTATUS smb2cli_flush(struct smbXcli_conn *conn, if (ev == NULL) { goto fail; } - req = smb2cli_flush_send(frame, ev, conn, timeout_msec, session, - tcon_id, fid_persistent, fid_volatile); + req = smb2cli_flush_send(frame, ev, conn, timeout_msec, + session, tcon, + fid_persistent, fid_volatile); if (req == NULL) { goto fail; } diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 8e90cde6e6e..3092b732aa5 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -428,14 +428,14 @@ struct tevent_req *smb2cli_flush_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 fid_persistent, uint64_t fid_volatile); NTSTATUS smb2cli_flush_recv(struct tevent_req *req); NTSTATUS smb2cli_flush(struct smbXcli_conn *conn, uint32_t timeout_msec, struct smbXcli_session *session, - uint32_t tcon_id, + struct smbXcli_tcon *tcon, uint64_t fid_persistent, uint64_t fid_volatile); |