summaryrefslogtreecommitdiff
path: root/source3/libsmb/smb2cli_close.c
diff options
context:
space:
mode:
authorLuk Claes <luk@debian.org>2012-05-10 18:32:49 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-12 00:44:41 +0200
commitf6db3d7bef750d48079ff56535f48c9923e5f4c8 (patch)
tree35a53ec537bd5fe9a2fd396956d455552ba58acf /source3/libsmb/smb2cli_close.c
parent14473f37f5a3cd4749f5c4f937fef37cc5ea8c47 (diff)
downloadsamba-f6db3d7bef750d48079ff56535f48c9923e5f4c8.tar.gz
samba-f6db3d7bef750d48079ff56535f48c9923e5f4c8.tar.bz2
samba-f6db3d7bef750d48079ff56535f48c9923e5f4c8.zip
s3/libsmb: Generalise cli_state in smb2 close calls
Signed-off-by: Luk Claes <luk@debian.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/libsmb/smb2cli_close.c')
-rw-r--r--source3/libsmb/smb2cli_close.c29
1 files changed, 19 insertions, 10 deletions
diff --git a/source3/libsmb/smb2cli_close.c b/source3/libsmb/smb2cli_close.c
index 246d9048b6..5c69fee9b4 100644
--- a/source3/libsmb/smb2cli_close.c
+++ b/source3/libsmb/smb2cli_close.c
@@ -33,7 +33,10 @@ static void smb2cli_close_done(struct tevent_req *subreq);
struct tevent_req *smb2cli_close_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
- struct cli_state *cli,
+ struct smbXcli_conn *conn,
+ uint32_t timeout_msec,
+ struct smbXcli_session *session,
+ uint32_t tcon_id,
uint16_t flags,
uint64_t fid_persistent,
uint64_t fid_volatile)
@@ -53,12 +56,12 @@ struct tevent_req *smb2cli_close_send(TALLOC_CTX *mem_ctx,
SBVAL(fixed, 8, fid_persistent);
SBVAL(fixed, 16, fid_volatile);
- subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_CLOSE,
+ subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_CLOSE,
0, 0, /* flags */
- cli->timeout,
- cli->smb2.pid,
- cli->smb2.tid,
- cli->smb2.session,
+ timeout_msec,
+ 0xFEFF, /* pid */
+ tcon_id,
+ session,
state->fixed, sizeof(state->fixed),
NULL, 0);
if (tevent_req_nomem(subreq, req)) {
@@ -94,15 +97,20 @@ NTSTATUS smb2cli_close_recv(struct tevent_req *req)
return tevent_req_simple_recv_ntstatus(req);
}
-NTSTATUS smb2cli_close(struct cli_state *cli, uint16_t flags,
- uint64_t fid_persistent, uint64_t fid_volatile)
+NTSTATUS smb2cli_close(struct smbXcli_conn *conn,
+ uint32_t timeout_msec,
+ struct smbXcli_session *session,
+ uint32_t tcon_id,
+ uint16_t flags,
+ uint64_t fid_persistent,
+ uint64_t fid_volatile)
{
TALLOC_CTX *frame = talloc_stackframe();
struct event_context *ev;
struct tevent_req *req;
NTSTATUS status = NT_STATUS_NO_MEMORY;
- if (cli_has_async_calls(cli)) {
+ if (smbXcli_conn_has_async_calls(conn)) {
/*
* Can't use sync call while an async call is in flight
*/
@@ -113,7 +121,8 @@ NTSTATUS smb2cli_close(struct cli_state *cli, uint16_t flags,
if (ev == NULL) {
goto fail;
}
- req = smb2cli_close_send(frame, ev, cli, flags,
+ req = smb2cli_close_send(frame, ev, conn, timeout_msec,
+ session, tcon_id, flags,
fid_persistent, fid_volatile);
if (req == NULL) {
goto fail;