diff options
author | Björn Baumbach <bb@sernet.de> | 2012-05-15 10:50:49 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2012-05-15 18:26:00 +0200 |
commit | 269000b1b344fb04efe0f12ca455b584074139d3 (patch) | |
tree | 9cd28bacd53eef0f0804b691f14ca906e8d605a9 /libcli | |
parent | 4022edc9064e7cde147f0c7cbd93b76db30fac4a (diff) | |
download | samba-269000b1b344fb04efe0f12ca455b584074139d3.tar.gz samba-269000b1b344fb04efe0f12ca455b584074139d3.tar.bz2 samba-269000b1b344fb04efe0f12ca455b584074139d3.zip |
libcli/smb: move smb2cli_read.c from source3 to the toplevel
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'libcli')
-rw-r--r-- | libcli/smb/smb2cli_read.c | 187 | ||||
-rw-r--r-- | libcli/smb/smbXcli_base.h | 28 | ||||
-rwxr-xr-x | libcli/smb/wscript_build | 1 |
3 files changed, 216 insertions, 0 deletions
diff --git a/libcli/smb/smb2cli_read.c b/libcli/smb/smb2cli_read.c new file mode 100644 index 0000000000..29b9f378e6 --- /dev/null +++ b/libcli/smb/smb2cli_read.c @@ -0,0 +1,187 @@ +/* + Unix SMB/CIFS implementation. + smb2 lib + Copyright (C) Volker Lendecke 2011 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "includes.h" +#include "system/network.h" +#include "lib/util/tevent_ntstatus.h" +#include "smb_common.h" +#include "smbXcli_base.h" + +struct smb2cli_read_state { + uint8_t fixed[48]; + uint8_t dyn_pad[1]; + struct iovec *recv_iov; + uint8_t *data; + uint32_t data_length; +}; + +static void smb2cli_read_done(struct tevent_req *subreq); + +struct tevent_req *smb2cli_read_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + 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, + uint64_t fid_volatile, + uint64_t minimum_count, + uint64_t remaining_bytes) +{ + struct tevent_req *req, *subreq; + struct smb2cli_read_state *state; + uint8_t *fixed; + + req = tevent_req_create(mem_ctx, &state, + struct smb2cli_read_state); + if (req == NULL) { + return NULL; + } + + fixed = state->fixed; + + SSVAL(fixed, 0, 49); + SIVAL(fixed, 4, length); + SBVAL(fixed, 8, offset); + SBVAL(fixed, 16, fid_persistent); + SBVAL(fixed, 24, fid_volatile); + SBVAL(fixed, 32, minimum_count); + SBVAL(fixed, 40, remaining_bytes); + + subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_READ, + 0, 0, /* flags */ + 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 tevent_req_post(req, ev); + } + tevent_req_set_callback(subreq, smb2cli_read_done, req); + return req; +} + +static void smb2cli_read_done(struct tevent_req *subreq) +{ + struct tevent_req *req = tevent_req_callback_data( + subreq, struct tevent_req); + struct smb2cli_read_state *state = + tevent_req_data(req, + struct smb2cli_read_state); + NTSTATUS status; + struct iovec *iov; + uint8_t data_offset; + static const struct smb2cli_req_expected_response expected[] = { + { + .status = STATUS_BUFFER_OVERFLOW, + .body_size = 0x11 + }, + { + .status = NT_STATUS_OK, + .body_size = 0x11 + } + }; + + status = smb2cli_req_recv(subreq, state, &iov, + expected, ARRAY_SIZE(expected)); + if (tevent_req_nterror(req, status)) { + return; + } + + data_offset = CVAL(iov[1].iov_base, 2); + state->data_length = IVAL(iov[1].iov_base, 4); + + if ((data_offset != SMB2_HDR_BODY + 16) || + (state->data_length > iov[2].iov_len)) { + tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE); + return; + } + + state->recv_iov = iov; + state->data = (uint8_t *)iov[2].iov_base; + tevent_req_done(req); +} + +NTSTATUS smb2cli_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, + uint8_t **data, uint32_t *data_length) +{ + struct smb2cli_read_state *state = + tevent_req_data(req, + struct smb2cli_read_state); + NTSTATUS status; + + if (tevent_req_is_nterror(req, &status)) { + return status; + } + talloc_steal(mem_ctx, state->recv_iov); + *data_length = state->data_length; + *data = state->data; + return NT_STATUS_OK; +} + +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, + uint64_t fid_volatile, + uint64_t minimum_count, + uint64_t remaining_bytes, + TALLOC_CTX *mem_ctx, + uint8_t **data, + uint32_t *data_length) +{ + TALLOC_CTX *frame = talloc_stackframe(); + struct tevent_context *ev; + struct tevent_req *req; + NTSTATUS status = NT_STATUS_NO_MEMORY; + + if (smbXcli_conn_has_async_calls(conn)) { + /* + * Can't use sync call while an async call is in flight + */ + status = NT_STATUS_INVALID_PARAMETER; + goto fail; + } + ev = tevent_context_init(frame); + if (ev == NULL) { + goto fail; + } + 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) { + goto fail; + } + if (!tevent_req_poll_ntstatus(req, ev, &status)) { + goto fail; + } + status = smb2cli_read_recv(req, mem_ctx, data, data_length); + fail: + TALLOC_FREE(frame); + return status; +} diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index baac22c555..3d1f393877 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -343,4 +343,32 @@ NTSTATUS smb2cli_close(struct smbXcli_conn *conn, uint64_t fid_persistent, uint64_t fid_volatile); +struct tevent_req *smb2cli_read_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + 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, + uint64_t fid_volatile, + uint64_t minimum_count, + uint64_t remaining_bytes); +NTSTATUS smb2cli_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, + uint8_t **data, uint32_t *data_length); +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, + uint64_t fid_volatile, + uint64_t minimum_count, + uint64_t remaining_bytes, + TALLOC_CTX *mem_ctx, + uint8_t **data, + uint32_t *data_length); + #endif /* _SMBXCLI_BASE_H_ */ diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build index 904e895878..69f9f032ae 100755 --- a/libcli/smb/wscript_build +++ b/libcli/smb/wscript_build @@ -11,6 +11,7 @@ bld.SAMBA_LIBRARY('cli_smb_common', smb2cli_session.c smb2cli_create.c smb2cli_close.c + smb2cli_read.c ''', deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ', public_deps='talloc samba-util', |