sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3/libsmb: Generalise cli_state in smb2 flush calls

Browse Source 
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Luk Claes 2012-05-10 18:35:50 +02:00 committed by Stefan Metzmacher
parent 87d890fdd9
commit 473363a807
3 changed files with 60 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/libsmb/smb2cli.h
View File

@ -98,11 +98,17 @@ NTSTATUS smb2cli_close(struct smbXcli_conn *conn,
struct tevent_req *smb2cli_flush_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,
uint64_t fid_persistent,
uint64_t fid_volatile);
NTSTATUS smb2cli_flush_recv(struct tevent_req *req);
NTSTATUS smb2cli_flush(struct cli_state *cli,
NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
uint32_t tcon_id,
uint64_t fid_persistent,
uint64_t fid_volatile);

26
source3/libsmb/smb2cli_flush.c
View File

@ -33,7 +33,10 @@ static void smb2cli_flush_done(struct tevent_req *subreq);
struct tevent_req *smb2cli_flush_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,
uint64_t fid_persistent,
uint64_t fid_volatile)
{
@ -51,12 +54,12 @@ struct tevent_req *smb2cli_flush_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_FLUSH,
subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_FLUSH,
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)) {
@ -92,7 +95,10 @@ NTSTATUS smb2cli_flush_recv(struct tevent_req *req)
return tevent_req_simple_recv_ntstatus(req);
}
NTSTATUS smb2cli_flush(struct cli_state *cli,
NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
uint32_t tcon_id,
uint64_t fid_persistent,
uint64_t fid_volatile)
{
@ -101,7 +107,7 @@ NTSTATUS smb2cli_flush(struct cli_state *cli,
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
*/
@ -112,8 +118,8 @@ NTSTATUS smb2cli_flush(struct cli_state *cli,
if (ev == NULL) {
goto fail;
}
req = smb2cli_flush_send(frame, ev, cli,
fid_persistent, fid_volatile);
req = smb2cli_flush_send(frame, ev, conn, timeout_msec, session,
tcon_id, fid_persistent, fid_volatile);
if (req == NULL) {
goto fail;
}

54
source3/torture/test_smb2.c
View File

@ -96,7 +96,8 @@ bool run_smb2_basic(int dummy)
return false;
}
status = smb2cli_flush(cli, fid_persistent, fid_volatile);
status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
cli->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -343,7 +344,8 @@ bool run_smb2_session_reconnect(int dummy)
return false;
}
status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -504,7 +506,8 @@ bool run_smb2_session_reconnect(int dummy)
/* check file operation on the old client */
status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -521,7 +524,8 @@ bool run_smb2_session_reconnect(int dummy)
* on w2k8r2 at least, flush, read and write also work the same way,
* while create gives ACCESS_DENIED without signing
*/
status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -575,7 +579,8 @@ bool run_smb2_session_reconnect(int dummy)
cli2->smb2.tid = cli1->smb2.tid;
status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -646,7 +651,8 @@ bool run_smb2_session_reconnect(int dummy)
return false;
}
status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -738,7 +744,8 @@ bool run_smb2_tcon_dependence(int dummy)
return false;
}
status = smb2cli_flush(cli, fid_persistent, fid_volatile);
status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
cli->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -1141,19 +1148,22 @@ bool run_smb2_multi_channel(int dummy)
return false;
}
status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
cli3->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -1252,19 +1262,22 @@ bool run_smb2_multi_channel(int dummy)
return false;
}
status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
cli3->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -1356,19 +1369,22 @@ bool run_smb2_multi_channel(int dummy)
return false;
}
status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
status = smb2cli_flush(cli3->conn, cli3->timeout, cli3->smb2.session,
cli3->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
status = smb2cli_flush(cli2->conn, cli2->timeout, cli2->smb2.session,
cli2->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
}
status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
status = smb2cli_flush(cli1->conn, cli1->timeout, cli1->smb2.session,
cli1->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -1555,7 +1571,8 @@ bool run_smb2_session_reauth(int dummy)
return false;
}
status = smb2cli_flush(cli, fid_persistent, fid_volatile);
status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
cli->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;
@ -1703,7 +1720,8 @@ bool run_smb2_session_reauth(int dummy)
return false;
}
status = smb2cli_flush(cli, fid_persistent, fid_volatile);
status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
cli->smb2.tid, fid_persistent, fid_volatile);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_flush returned %s\n", nt_errstr(status));
return false;