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 | 697b82a61979b48de86d74d2bf5c498032ff49b1 (patch) | |
| tree | 15b979f43065e3ce53f82c3ea57fa080a0a3fb19 /source3 | |
| parent | 74f9b52e659265c7a6283550d226f0cec5e8fb18 (diff) | |
| download | samba-697b82a61979b48de86d74d2bf5c498032ff49b1.tar.gz samba-697b82a61979b48de86d74d2bf5c498032ff49b1.tar.bz2 samba-697b82a61979b48de86d74d2bf5c498032ff49b1.zip | |
libcli/smb: pass smbXcli_tcon to smb2cli_read*()
metze
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/cli_np_tstream.c | 2 | ||||
| -rw-r--r-- | source3/torture/test_smb2.c | 30 |
2 files changed, 21 insertions, 11 deletions
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c index 47333868dc..2ec33d5ac4 100644 --- a/source3/libsmb/cli_np_tstream.c +++ b/source3/libsmb/cli_np_tstream.c @@ -773,7 +773,7 @@ static void tstream_cli_np_readv_read_next(struct tevent_req *req) cli_nps->cli->conn, cli_nps->cli->timeout, cli_nps->cli->smb2.session, - cli_nps->cli->smb2.tid, + cli_nps->cli->smb2.tcon, TSTREAM_CLI_NP_MAX_BUF_SIZE, /* length */ 0, /* offset */ cli_nps->fid_persistent, diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c index a4655dc05d..ba5cb8ffba 100644 --- a/source3/torture/test_smb2.c +++ b/source3/torture/test_smb2.c @@ -105,7 +105,7 @@ bool run_smb2_basic(int dummy) } status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session, - cli->smb2.tid, 0x10000, 0, fid_persistent, + cli->smb2.tcon, 0x10000, 0, fid_persistent, fid_volatile, 2, 0, talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { @@ -355,7 +355,7 @@ bool run_smb2_session_reconnect(int dummy) } status = smb2cli_read(cli1->conn, cli1->timeout, cli1->smb2.session, - cli1->smb2.tid, 0x10000, 0, fid_persistent, + cli1->smb2.tcon, 0x10000, 0, fid_persistent, fid_volatile, 2, 0, talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { @@ -547,7 +547,7 @@ bool run_smb2_session_reconnect(int dummy) } status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session, - cli2->smb2.tid, 0x10000, 0, fid_persistent, + cli2->smb2.tcon, 0x10000, 0, fid_persistent, fid_volatile, 2, 0, talloc_tos(), &result, &nread); if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) && @@ -609,7 +609,7 @@ bool run_smb2_session_reconnect(int dummy) } status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session, - cli2->smb2.tid, 0x10000, 0, fid_persistent, + cli2->smb2.tcon, 0x10000, 0, fid_persistent, fid_volatile, 2, 0, talloc_tos(), &result, &nread); if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) && @@ -679,7 +679,7 @@ bool run_smb2_session_reconnect(int dummy) } status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session, - cli2->smb2.tid, 0x10000, 0, fid_persistent, + cli2->smb2.tcon, 0x10000, 0, fid_persistent, fid_volatile, 2, 0, talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { @@ -710,6 +710,8 @@ bool run_smb2_tcon_dependence(int dummy) const char *hello = "Hello, world\n"; uint8_t *result; uint32_t nread; + struct smbXcli_tcon *tcon2; + uint32_t tcon2_id; printf("Starting SMB2-TCON-DEPENDENCE\n"); @@ -773,7 +775,7 @@ bool run_smb2_tcon_dependence(int dummy) } status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session, - cli->smb2.tid, 0x10000, 0, fid_persistent, + cli->smb2.tcon, 0x10000, 0, fid_persistent, fid_volatile, 2, 0, talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { @@ -795,10 +797,18 @@ bool run_smb2_tcon_dependence(int dummy) /* check behaviour with wrong tid... */ - cli->smb2.tid++; + tcon2 = smbXcli_tcon_create(cli); + tcon2_id = smb2cli_tcon_current_id(cli->smb2.tcon); + tcon2_id++; + smb2cli_tcon_set_values(tcon2, + tcon2_id, + 0, /* type */ + 0, /* flags */ + 0, /* capabilities */ + 0 /* maximal_access */); status = smb2cli_read(cli->conn, cli->timeout, cli->smb2.session, - cli->smb2.tid, 0x10000, 0, fid_persistent, + tcon2, 0x10000, 0, fid_persistent, fid_volatile, 2, 0, talloc_tos(), &result, &nread); if (!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED)) { @@ -806,7 +816,7 @@ bool run_smb2_tcon_dependence(int dummy) return false; } - cli->smb2.tid--; + talloc_free(tcon2); return true; } @@ -1192,7 +1202,7 @@ bool run_smb2_multi_channel(int dummy) } status = smb2cli_read(cli2->conn, cli2->timeout, cli2->smb2.session, - cli2->smb2.tid, 0x10000, 0, fid_persistent, + cli2->smb2.tcon, 0x10000, 0, fid_persistent, fid_volatile, 2, 0, talloc_tos(), &result, &nread); if (!NT_STATUS_IS_OK(status)) { |