struct tevent_req *smb2cli_read_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,
uint32_t length,
uint64_t offset,
uint64_t fid_persistent,
SBVAL(fixed, 32, minimum_count);
SBVAL(fixed, 40, remaining_bytes);
- subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_READ,
+ subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_READ,
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),
state->dyn_pad, sizeof(state->dyn_pad));
if (tevent_req_nomem(subreq, req)) {
return NT_STATUS_OK;
}
-NTSTATUS smb2cli_read(struct cli_state *cli,
+NTSTATUS smb2cli_read(struct smbXcli_conn *conn,
+ uint32_t timeout_msec,
+ struct smbXcli_session *session,
+ uint32_t tcon_id,
uint32_t length,
uint64_t offset,
uint64_t fid_persistent,
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
*/
if (ev == NULL) {
goto fail;
}
- req = smb2cli_read_send(frame, ev, cli, length, offset,
+ req = smb2cli_read_send(frame, ev,
+ conn, timeout_msec, session, tcon_id,
+ length, offset,
fid_persistent, fid_volatile,
minimum_count, remaining_bytes);
if (req == NULL) {
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;
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;
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;
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;
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;
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;
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;
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;