summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libcli/smb/smb2cli_write.c30
-rw-r--r--libcli/smb/smbXcli_base.h6
-rw-r--r--source3/libsmb/cli_np_tstream.c7
-rw-r--r--source3/torture/test_smb2.c14
4 files changed, 41 insertions, 16 deletions
diff --git a/libcli/smb/smb2cli_write.c b/libcli/smb/smb2cli_write.c
index 8e65460fcb..89137bd5ba 100644
--- a/libcli/smb/smb2cli_write.c
+++ b/libcli/smb/smb2cli_write.c
@@ -26,6 +26,7 @@
struct smb2cli_write_state {
uint8_t fixed[48];
uint8_t dyn_pad[1];
+ uint32_t written;
};
static void smb2cli_write_done(struct tevent_req *subreq);
@@ -94,7 +95,11 @@ static void smb2cli_write_done(struct tevent_req *subreq)
struct tevent_req *req =
tevent_req_callback_data(subreq,
struct tevent_req);
+ struct smb2cli_write_state *state =
+ tevent_req_data(req,
+ struct smb2cli_write_state);
NTSTATUS status;
+ struct iovec *iov;
static const struct smb2cli_req_expected_response expected[] = {
{
.status = NT_STATUS_OK,
@@ -102,18 +107,32 @@ static void smb2cli_write_done(struct tevent_req *subreq)
}
};
- status = smb2cli_req_recv(subreq, NULL, NULL,
+ status = smb2cli_req_recv(subreq, state, &iov,
expected, ARRAY_SIZE(expected));
TALLOC_FREE(subreq);
if (tevent_req_nterror(req, status)) {
return;
}
+ state->written = IVAL(iov[1].iov_base, 4);
tevent_req_done(req);
}
-NTSTATUS smb2cli_write_recv(struct tevent_req *req)
+NTSTATUS smb2cli_write_recv(struct tevent_req *req, uint32_t *written)
{
- return tevent_req_simple_recv_ntstatus(req);
+ struct smb2cli_write_state *state =
+ tevent_req_data(req,
+ struct smb2cli_write_state);
+ NTSTATUS status;
+
+ if (tevent_req_is_nterror(req, &status)) {
+ tevent_req_received(req);
+ return status;
+ }
+ if (written) {
+ *written = state->written;
+ }
+ tevent_req_received(req);
+ return NT_STATUS_OK;
}
NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
@@ -126,7 +145,8 @@ NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
uint64_t fid_volatile,
uint32_t remaining_bytes,
uint32_t flags,
- const uint8_t *data)
+ const uint8_t *data,
+ uint32_t *written)
{
TALLOC_CTX *frame = talloc_stackframe();
struct tevent_context *ev;
@@ -155,7 +175,7 @@ NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
if (!tevent_req_poll_ntstatus(req, ev, &status)) {
goto fail;
}
- status = smb2cli_write_recv(req);
+ status = smb2cli_write_recv(req, written);
fail:
TALLOC_FREE(frame);
return status;
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index f7b60d30bb..997869ba07 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -429,7 +429,8 @@ struct tevent_req *smb2cli_write_send(TALLOC_CTX *mem_ctx,
uint32_t remaining_bytes,
uint32_t flags,
const uint8_t *data);
-NTSTATUS smb2cli_write_recv(struct tevent_req *req);
+NTSTATUS smb2cli_write_recv(struct tevent_req *req,
+ uint32_t *written);
NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
uint32_t timeout_msec,
struct smbXcli_session *session,
@@ -440,7 +441,8 @@ NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
uint64_t fid_volatile,
uint32_t remaining_bytes,
uint32_t flags,
- const uint8_t *data);
+ const uint8_t *data,
+ uint32_t *written);
struct tevent_req *smb2cli_flush_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c
index c7ec664c51..07835a5bc2 100644
--- a/source3/libsmb/cli_np_tstream.c
+++ b/source3/libsmb/cli_np_tstream.c
@@ -527,8 +527,11 @@ static void tstream_cli_np_writev_write_done(struct tevent_req *subreq)
if (cli_nps->is_smb1) {
status = cli_write_andx_recv(subreq, &written);
} else {
- status = smb2cli_write_recv(subreq);
- written = cli_nps->write.ofs; // TODO: get the value from the server
+ uint32_t smb2_written;
+ status = smb2cli_write_recv(subreq, &smb2_written);
+ if (NT_STATUS_IS_OK(status)) {
+ written = smb2_written;
+ }
}
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index ec695da8f6..7ca9f49d1a 100644
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -91,7 +91,7 @@ bool run_smb2_basic(int dummy)
status = smb2cli_write(cli->conn, cli->timeout, cli->smb2.session,
cli->smb2.tcon, strlen(hello), 0, fid_persistent,
- fid_volatile, 0, 0, (const uint8_t *)hello);
+ fid_volatile, 0, 0, (const uint8_t *)hello, NULL);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
return false;
@@ -349,7 +349,7 @@ bool run_smb2_session_reconnect(int dummy)
status = smb2cli_write(cli1->conn, cli1->timeout, cli1->smb2.session,
cli1->smb2.tcon, strlen(hello), 0, fid_persistent,
- fid_volatile, 0, 0, (const uint8_t *)hello);
+ fid_volatile, 0, 0, (const uint8_t *)hello, NULL);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
return false;
@@ -545,7 +545,7 @@ bool run_smb2_session_reconnect(int dummy)
status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
cli2->smb2.tcon, strlen(hello), 0, fid_persistent,
- fid_volatile, 0, 0, (const uint8_t *)hello);
+ fid_volatile, 0, 0, (const uint8_t *)hello, NULL);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) &&
!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
{
@@ -605,7 +605,7 @@ bool run_smb2_session_reconnect(int dummy)
status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
cli1->smb2.tcon, strlen(hello), 0, fid_persistent,
- fid_volatile, 0, 0, (const uint8_t *)hello);
+ fid_volatile, 0, 0, (const uint8_t *)hello, NULL);
if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED) &&
!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED))
{
@@ -670,7 +670,7 @@ bool run_smb2_session_reconnect(int dummy)
status = smb2cli_write(cli2->conn, cli2->timeout, cli2->smb2.session,
cli2->smb2.tcon, strlen(hello), 0, fid_persistent,
- fid_volatile, 0, 0, (const uint8_t *)hello);
+ fid_volatile, 0, 0, (const uint8_t *)hello, NULL);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
return false;
@@ -765,7 +765,7 @@ bool run_smb2_tcon_dependence(int dummy)
status = smb2cli_write(cli->conn, cli->timeout, cli->smb2.session,
cli->smb2.tcon, strlen(hello), 0, fid_persistent,
- fid_volatile, 0, 0, (const uint8_t *)hello);
+ fid_volatile, 0, 0, (const uint8_t *)hello, NULL);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
return false;
@@ -1172,7 +1172,7 @@ bool run_smb2_multi_channel(int dummy)
status = smb2cli_write(cli1->conn, cli1->timeout, cli1->smb2.session,
cli1->smb2.tcon, strlen(hello), 0, fid_persistent,
- fid_volatile, 0, 0, (const uint8_t *)hello);
+ fid_volatile, 0, 0, (const uint8_t *)hello, NULL);
if (!NT_STATUS_IS_OK(status)) {
printf("smb2cli_write returned %s\n", nt_errstr(status));
return false;
generated by cgit (git 2.34.1) at 2024-05-18 21:24:34 +0000