sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Convert cli_write_andx to tevent_req

Browse Source
This commit is contained in:
Volker Lendecke 2009-03-29 13:28:18 +02:00
parent 17b8d05b62
commit 097db28c5d
3 changed files with 112 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/include/proto.h
View File

@ -2793,12 +2793,20 @@ ssize_t cli_write(struct cli_state *cli,
const char *buf, off_t offset, size_t size); const char *buf, off_t offset, size_t size);
ssize_t cli_smbwrite(struct cli_state *cli, ssize_t cli_smbwrite(struct cli_state *cli,
int fnum, char *buf, off_t offset, size_t size1); int fnum, char *buf, off_t offset, size_t size1);
struct async_req *cli_write_andx_send(TALLOC_CTX *mem_ctx, struct tevent_req *cli_write_andx_create(TALLOC_CTX *mem_ctx,
struct event_context *ev, struct event_context *ev,
struct cli_state *cli, uint16_t fnum, struct cli_state *cli, uint16_t fnum,
uint16_t mode, const uint8_t *buf, uint16_t mode, const uint8_t *buf,
off_t offset, size_t size); off_t offset, size_t size,
NTSTATUS cli_write_andx_recv(struct async_req *req, size_t *pwritten); struct tevent_req **reqs_before,
int num_reqs_before,
struct tevent_req **psmbreq);
struct tevent_req *cli_write_andx_send(TALLOC_CTX *mem_ctx,
struct event_context *ev,
struct cli_state *cli, uint16_t fnum,
uint16_t mode, const uint8_t *buf,
off_t offset, size_t size);
NTSTATUS cli_write_andx_recv(struct tevent_req *req, size_t *pwritten);
struct async_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev, struct async_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
struct cli_state *cli, struct cli_state *cli,

129
source3/libsmb/clireadwrite.c
View File

@ -795,19 +795,41 @@ ssize_t cli_smbwrite(struct cli_state *cli,
* Send a write&x request * Send a write&x request
*/ */
struct async_req *cli_write_andx_send(TALLOC_CTX *mem_ctx, struct cli_write_andx_state {
struct event_context *ev, size_t size;
struct cli_state *cli, uint16_t fnum, uint16_t vwv[14];
uint16_t mode, const uint8_t *buf, size_t written;
off_t offset, size_t size) uint8_t pad;
struct iovec iov[2];
};
static void cli_write_andx_done(struct tevent_req *subreq);
struct tevent_req *cli_write_andx_create(TALLOC_CTX *mem_ctx,
struct event_context *ev,
struct cli_state *cli, uint16_t fnum,
uint16_t mode, const uint8_t *buf,
off_t offset, size_t size,
struct tevent_req **reqs_before,
int num_reqs_before,
struct tevent_req **psmbreq)
{ {
struct tevent_req *req, *subreq;
struct cli_write_andx_state *state;
bool bigoffset = ((cli->capabilities & CAP_LARGE_FILES) != 0); bool bigoffset = ((cli->capabilities & CAP_LARGE_FILES) != 0);
uint8_t wct = bigoffset ? 14 : 12; uint8_t wct = bigoffset ? 14 : 12;
size_t max_write = cli_write_max_bufsize(cli, mode); size_t max_write = cli_write_max_bufsize(cli, mode);
uint16_t vwv[14]; uint16_t *vwv;
req = tevent_req_create(mem_ctx, &state, struct cli_write_andx_state);
if (req == NULL) {
return NULL;
}
size = MIN(size, max_write); size = MIN(size, max_write);
vwv = state->vwv;
SCVAL(vwv+0, 0, 0xFF); SCVAL(vwv+0, 0, 0xFF);
SCVAL(vwv+0, 1, 0); SCVAL(vwv+0, 1, 0);
SSVAL(vwv+1, 0, 0); SSVAL(vwv+1, 0, 0);
@ -820,7 +842,7 @@ struct async_req *cli_write_andx_send(TALLOC_CTX *mem_ctx,
SSVAL(vwv+10, 0, size); SSVAL(vwv+10, 0, size);
SSVAL(vwv+11, 0, SSVAL(vwv+11, 0,
cli_wct_ofs(cli) cli_smb_wct_ofs(reqs_before, num_reqs_before)
+ 1 /* the wct field */ + 1 /* the wct field */
+ wct * 2 /* vwv */ + wct * 2 /* vwv */
+ 2 /* num_bytes field */ + 2 /* num_bytes field */
@ -830,37 +852,70 @@ struct async_req *cli_write_andx_send(TALLOC_CTX *mem_ctx,
SIVAL(vwv+12, 0, (((uint64_t)offset)>>32) & 0xffffffff); SIVAL(vwv+12, 0, (((uint64_t)offset)>>32) & 0xffffffff);
} }
return cli_request_send(mem_ctx, ev, cli, SMBwriteX, 0, wct, vwv, state->pad = 0;
2, size, buf); state->iov[0].iov_base = &state->pad;
state->iov[0].iov_len = 1;
state->iov[1].iov_base = CONST_DISCARD(uint8_t *, buf);
state->iov[1].iov_len = size;
subreq = cli_smb_req_create(state, ev, cli, SMBwriteX, 0, wct, vwv,
2, state->iov);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, cli_write_andx_done, req);
*psmbreq = subreq;
return req;
} }
NTSTATUS cli_write_andx_recv(struct async_req *req, size_t *pwritten) struct tevent_req *cli_write_andx_send(TALLOC_CTX *mem_ctx,
struct event_context *ev,
struct cli_state *cli, uint16_t fnum,
uint16_t mode, const uint8_t *buf,
off_t offset, size_t size)
{ {
struct tevent_req *req, *subreq;
req = cli_write_andx_create(mem_ctx, ev, cli, fnum, mode, buf, offset,
size, NULL, 0, &subreq);
if ((req == NULL) || !cli_smb_req_send(subreq)) {
TALLOC_FREE(req);
return NULL;
}
return req;
}
static void cli_write_andx_done(struct tevent_req *subreq)
{
struct tevent_req *req = tevent_req_callback_data(
subreq, struct tevent_req);
struct cli_write_andx_state *state = tevent_req_data(
req, struct cli_write_andx_state);
uint8_t wct; uint8_t wct;
uint16_t *vwv; uint16_t *vwv;
uint16_t num_bytes;
uint8_t *bytes;
NTSTATUS status; NTSTATUS status;
size_t written;
if (async_req_is_nterror(req, &status)) {
return status;
}
status = cli_pull_reply(req, &wct, &vwv, &num_bytes, &bytes);
status = cli_smb_recv(subreq, 6, &wct, &vwv, NULL, NULL);
if (NT_STATUS_IS_ERR(status)) { if (NT_STATUS_IS_ERR(status)) {
TALLOC_FREE(subreq);
tevent_req_nterror(req, status);
return;
}
state->written = SVAL(vwv+2, 0);
state->written |= SVAL(vwv+4, 0)<<16;
tevent_req_done(req);
}
NTSTATUS cli_write_andx_recv(struct tevent_req *req, size_t *pwritten)
{
struct cli_write_andx_state *state = tevent_req_data(
req, struct cli_write_andx_state);
NTSTATUS status;
if (tevent_req_is_nterror(req, &status)) {
return status; return status;
} }
*pwritten = state->written;
if (wct < 6) {
return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
written = SVAL(vwv+2, 0);
written |= SVAL(vwv+4, 0)<<16;
*pwritten = written;
return NT_STATUS_OK; return NT_STATUS_OK;
} }
@ -875,7 +930,7 @@ struct cli_writeall_state {
size_t written; size_t written;
}; };
static void cli_writeall_written(struct async_req *req); static void cli_writeall_written(struct tevent_req *req);
static struct async_req *cli_writeall_send(TALLOC_CTX *mem_ctx, static struct async_req *cli_writeall_send(TALLOC_CTX *mem_ctx,
struct event_context *ev, struct event_context *ev,
@ -886,7 +941,7 @@ static struct async_req *cli_writeall_send(TALLOC_CTX *mem_ctx,
off_t offset, size_t size) off_t offset, size_t size)
{ {
struct async_req *result; struct async_req *result;
struct async_req *subreq; struct tevent_req *subreq;
struct cli_writeall_state *state; struct cli_writeall_state *state;
if (!async_req_setup(mem_ctx, &result, &state, if (!async_req_setup(mem_ctx, &result, &state,
@ -908,9 +963,7 @@ static struct async_req *cli_writeall_send(TALLOC_CTX *mem_ctx,
if (subreq == NULL) { if (subreq == NULL) {
goto fail; goto fail;
} }
tevent_req_set_callback(subreq, cli_writeall_written, result);
subreq->async.fn = cli_writeall_written;
subreq->async.priv = result;
return result; return result;
fail: fail:
@ -918,10 +971,10 @@ static struct async_req *cli_writeall_send(TALLOC_CTX *mem_ctx,
return NULL; return NULL;
} }
static void cli_writeall_written(struct async_req *subreq) static void cli_writeall_written(struct tevent_req *subreq)
{ {
struct async_req *req = talloc_get_type_abort( struct async_req *req = tevent_req_callback_data(
subreq->async.priv, struct async_req); subreq, struct async_req);
struct cli_writeall_state *state = talloc_get_type_abort( struct cli_writeall_state *state = talloc_get_type_abort(
req->private_data, struct cli_writeall_state); req->private_data, struct cli_writeall_state);
NTSTATUS status; NTSTATUS status;
@ -956,9 +1009,7 @@ static void cli_writeall_written(struct async_req *subreq)
async_req_nterror(req, NT_STATUS_NO_MEMORY); async_req_nterror(req, NT_STATUS_NO_MEMORY);
return; return;
} }
tevent_req_set_callback(subreq, cli_writeall_written, req);
subreq->async.fn = cli_writeall_written;
subreq->async.priv = req;
} }
static NTSTATUS cli_writeall_recv(struct async_req *req) static NTSTATUS cli_writeall_recv(struct async_req *req)

21
source3/rpc_client/rpc_transport_np.c
View File

@ -49,7 +49,7 @@ struct rpc_np_write_state {
size_t written; size_t written;
}; };
static void rpc_np_write_done(struct async_req *subreq); static void rpc_np_write_done(struct tevent_req *subreq);
static struct tevent_req *rpc_np_write_send(TALLOC_CTX *mem_ctx, static struct tevent_req *rpc_np_write_send(TALLOC_CTX *mem_ctx,
struct event_context *ev, struct event_context *ev,
@ -58,8 +58,7 @@ static struct tevent_req *rpc_np_write_send(TALLOC_CTX *mem_ctx,
{ {
struct rpc_transport_np_state *np_transport = talloc_get_type_abort( struct rpc_transport_np_state *np_transport = talloc_get_type_abort(
priv, struct rpc_transport_np_state); priv, struct rpc_transport_np_state);
struct tevent_req *req; struct tevent_req *req, *subreq;
struct async_req *subreq;
struct rpc_np_write_state *state; struct rpc_np_write_state *state;
req = tevent_req_create(mem_ctx, &state, struct rpc_np_write_state); req = tevent_req_create(mem_ctx, &state, struct rpc_np_write_state);
@ -72,21 +71,17 @@ static struct tevent_req *rpc_np_write_send(TALLOC_CTX *mem_ctx,
np_transport->fnum, np_transport->fnum,
8, /* 8 means message mode. */ 8, /* 8 means message mode. */
data, 0, size); data, 0, size);
if (subreq == NULL) { if (tevent_req_nomem(subreq, req)) {
goto fail; return tevent_req_post(req, ev);
} }
subreq->async.fn = rpc_np_write_done; tevent_req_set_callback(subreq, rpc_np_write_done, req);
subreq->async.priv = req;
return req; return req;
fail:
TALLOC_FREE(req);
return NULL;
} }
static void rpc_np_write_done(struct async_req *subreq) static void rpc_np_write_done(struct tevent_req *subreq)
{ {
struct tevent_req *req = talloc_get_type_abort( struct tevent_req *req = tevent_req_callback_data(
subreq->async.priv, struct tevent_req); subreq, struct tevent_req);
struct rpc_np_write_state *state = tevent_req_data( struct rpc_np_write_state *state = tevent_req_data(
req, struct rpc_np_write_state); req, struct rpc_np_write_state);
NTSTATUS status; NTSTATUS status;