diff options
| author | Luk Claes <luk@debian.org> | 2012-05-10 18:30:25 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-12 00:43:53 +0200 |
| commit | 14473f37f5a3cd4749f5c4f937fef37cc5ea8c47 (patch) | |
| tree | 940c38236d6810374f38909d715cc0893fa0ed77 /source3/torture | |
| parent | 0048dd95cda1f80bbf3bac9bf50d1cc129681f49 (diff) | |
| download | samba-14473f37f5a3cd4749f5c4f937fef37cc5ea8c47.tar.gz samba-14473f37f5a3cd4749f5c4f937fef37cc5ea8c47.tar.bz2 samba-14473f37f5a3cd4749f5c4f937fef37cc5ea8c47.zip | |
s3-libsmb: Generalise cli_state in smb2 read calls
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/test_smb2.c | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c index 69776f4496..1a4eed95cc 100644 --- a/source3/torture/test_smb2.c +++ b/source3/torture/test_smb2.c @@ -101,9 +101,10 @@ bool run_smb2_basic(int dummy) return false; } - status = smb2cli_read(cli, 0x10000, 0, fid_persistent, - fid_volatile, 2, 0, - talloc_tos(), &result, &nread); + status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session, + cli->smb2.tid, 0x10000, 0, fid_persistent, + fid_volatile, 2, 0, + talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_read returned %s\n", nt_errstr(status)); return false; @@ -343,9 +344,10 @@ bool run_smb2_session_reconnect(int dummy) return false; } - status = smb2cli_read(cli1, 0x10000, 0, fid_persistent, - fid_volatile, 2, 0, - talloc_tos(), &result, &nread); + status = smb2cli_read(cli1->conn, cli1->timeout, cli1->smb2.session, + cli1->smb2.tid, 0x10000, 0, fid_persistent, + fid_volatile, 2, 0, + talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_read returned %s\n", nt_errstr(status)); return false; @@ -527,9 +529,10 @@ bool run_smb2_session_reconnect(int dummy) return false; } - status = smb2cli_read(cli2, 0x10000, 0, fid_persistent, - fid_volatile, 2, 0, - talloc_tos(), &result, &nread); + status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session, + cli2->smb2.tid, 0x10000, 0, fid_persistent, + fid_volatile, 2, 0, + talloc_tos(), &result, &nread); if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) { printf("smb2cli_read returned %s\n", nt_errstr(status)); return false; @@ -579,9 +582,10 @@ bool run_smb2_session_reconnect(int dummy) return false; } - status = smb2cli_read(cli2, 0x10000, 0, fid_persistent, - fid_volatile, 2, 0, - talloc_tos(), &result, &nread); + status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session, + cli2->smb2.tid, 0x10000, 0, fid_persistent, + fid_volatile, 2, 0, + talloc_tos(), &result, &nread); if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) { printf("smb2cli_read returned %s\n", nt_errstr(status)); return false; @@ -640,9 +644,10 @@ bool run_smb2_session_reconnect(int dummy) return false; } - status = smb2cli_read(cli2, 0x10000, 0, fid_persistent, - fid_volatile, 2, 0, - talloc_tos(), &result, &nread); + status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session, + cli2->smb2.tid, 0x10000, 0, fid_persistent, + fid_volatile, 2, 0, + talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_read returned %s\n", nt_errstr(status)); return false; @@ -730,9 +735,10 @@ bool run_smb2_tcon_dependence(int dummy) return false; } - status = smb2cli_read(cli, 0x10000, 0, fid_persistent, - fid_volatile, 2, 0, - talloc_tos(), &result, &nread); + status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session, + cli->smb2.tid, 0x10000, 0, fid_persistent, + fid_volatile, 2, 0, + talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_read returned %s\n", nt_errstr(status)); return false; @@ -754,9 +760,10 @@ bool run_smb2_tcon_dependence(int dummy) cli->smb2.tid++; - status = smb2cli_read(cli, 0x10000, 0, fid_persistent, - fid_volatile, 2, 0, - talloc_tos(), &result, &nread); + status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session, + cli->smb2.tid, 0x10000, 0, fid_persistent, + fid_volatile, 2, 0, + talloc_tos(), &result, &nread); if (!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED)) { printf("smb2cli_read returned %s\n", nt_errstr(status)); return false; @@ -1142,9 +1149,10 @@ bool run_smb2_multi_channel(int dummy) return false; } - status = smb2cli_read(cli2, 0x10000, 0, fid_persistent, - fid_volatile, 2, 0, - talloc_tos(), &result, &nread); + status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session, + cli2->smb2.tid, 0x10000, 0, fid_persistent, + fid_volatile, 2, 0, + talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_read returned %s\n", nt_errstr(status)); return false; |