From 6ebbce96a4fcd1fea8009698e9c0ea8fb4a5e220 Mon Sep 17 00:00:00 2001 From: Gregor Beck Date: Fri, 13 Sep 2013 09:26:25 +0200 Subject: [PATCH] s3:libsmb: let cli_np_tstream use smb1cli_readx Signed-off-by: Gregor Beck Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- source3/libsmb/cli_np_tstream.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c index a4a41d2db3f..8acce39041b 100644 --- a/source3/libsmb/cli_np_tstream.c +++ b/source3/libsmb/cli_np_tstream.c @@ -777,7 +777,12 @@ static void tstream_cli_np_readv_read_next(struct tevent_req *req) } if (cli_nps->is_smb1) { - subreq = cli_read_andx_send(state, state->ev, cli_nps->cli, + subreq = smb1cli_readx_send(state, state->ev, + cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb1.pid, + cli_nps->cli->smb1.tcon, + cli_nps->cli->smb1.session, cli_nps->fnum, 0, /* offset */ TSTREAM_CLI_NP_MAX_BUF_SIZE); @@ -961,7 +966,7 @@ static void tstream_cli_np_readv_read_done(struct tevent_req *subreq) struct tstream_cli_np *cli_nps = tstream_context_data(state->stream, struct tstream_cli_np); uint8_t *rcvbuf; - ssize_t received; + uint32_t received; NTSTATUS status; /* @@ -970,11 +975,9 @@ static void tstream_cli_np_readv_read_done(struct tevent_req *subreq) */ if (cli_nps->is_smb1) { - status = cli_read_andx_recv(subreq, &received, &rcvbuf); + status = smb1cli_readx_recv(subreq, &received, &rcvbuf); } else { - uint32_t data_length = 0; - status = smb2cli_read_recv(subreq, state, &rcvbuf, &data_length); - received = data_length; + status = smb2cli_read_recv(subreq, state, &rcvbuf, &received); } /* * We can't TALLOC_FREE(subreq) as usual here, as rcvbuf still is a