From fdd6c4e673daa21cbf59bce023cfbd753974f48a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 5 May 2011 18:12:07 +0200 Subject: [PATCH] s3:libsmb: add smb2cli_query_directory*() Based on the initial patch from Volker Lendecke . metze --- source3/Makefile.in | 1 + source3/libsmb/smb2cli.h | 26 +++++ source3/libsmb/smb2cli_query_directory.c | 179 +++++++++++++++++++++++++++++++ source3/wscript_build | 1 + 4 files changed, 207 insertions(+) create mode 100644 source3/libsmb/smb2cli_query_directory.c diff --git a/source3/Makefile.in b/source3/Makefile.in index 3a5eeb1ba2e..da3cb1a3402 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -610,6 +610,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ libsmb/smb2cli_flush.o \ libsmb/smb2cli_read.o \ libsmb/smb2cli_write.o \ + libsmb/smb2cli_query_directory.o \ libsmb/cli_np_tstream.o \ libsmb/smbsock_connect.o \ $(LIBSAMBA_OBJ) \ diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h index 5bd4f71fa0a..5db481f7c2b 100644 --- a/source3/libsmb/smb2cli.h +++ b/source3/libsmb/smb2cli.h @@ -146,4 +146,30 @@ NTSTATUS smb2cli_write(struct cli_state *cli, uint32_t flags, const uint8_t *data); +struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct cli_state *cli, + uint8_t level, + uint8_t flags, + uint32_t file_index, + uint64_t fid_persistent, + uint64_t fid_volatile, + const char *mask, + uint32_t outbuf_len); +NTSTATUS smb2cli_query_directory_recv(struct tevent_req *req, + TALLOC_CTX *mem_ctx, + uint8_t **data, + uint32_t *data_length); +NTSTATUS smb2cli_query_directory(struct cli_state *cli, + uint8_t level, + uint8_t flags, + uint32_t file_index, + uint64_t fid_persistent, + uint64_t fid_volatile, + const char *mask, + uint32_t outbuf_len, + TALLOC_CTX *mem_ctx, + uint8_t **data, + uint32_t *data_length); + #endif /* __SMB2CLI_H__ */ diff --git a/source3/libsmb/smb2cli_query_directory.c b/source3/libsmb/smb2cli_query_directory.c new file mode 100644 index 00000000000..fc6c0b79a06 --- /dev/null +++ b/source3/libsmb/smb2cli_query_directory.c @@ -0,0 +1,179 @@ +/* + 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 . +*/ + +#include "includes.h" +#include "client.h" +#include "async_smb.h" +#include "smb2cli_base.h" +#include "smb2cli.h" +#include "libsmb/proto.h" +#include "lib/util/tevent_ntstatus.h" + +struct smb2cli_query_directory_state { + uint8_t fixed[32]; + uint8_t *inbuf; + uint8_t *data; + uint32_t data_length; +}; + +static void smb2cli_query_directory_done(struct tevent_req *subreq); + +struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct cli_state *cli, + uint8_t level, + uint8_t flags, + uint32_t file_index, + uint64_t fid_persistent, + uint64_t fid_volatile, + const char *mask, + uint32_t outbuf_len) +{ + struct tevent_req *req, *subreq; + struct smb2cli_query_directory_state *state; + uint8_t *fixed; + uint8_t *dyn; + size_t dyn_len; + + req = tevent_req_create(mem_ctx, &state, + struct smb2cli_query_directory_state); + if (req == NULL) { + return NULL; + } + + if (!convert_string_talloc(state, CH_UNIX, CH_UTF16, + mask, strlen(mask)+1, + &dyn, &dyn_len)) { + tevent_req_nomem(NULL, req); + return tevent_req_post(req, ev); + } + + fixed = state->fixed; + SSVAL(fixed, 0, 33); + SCVAL(fixed, 2, level); + SCVAL(fixed, 3, flags); + SIVAL(fixed, 4, file_index); + SBVAL(fixed, 8, fid_persistent); + SBVAL(fixed, 16, fid_volatile); + SSVAL(fixed, 24, SMB2_HDR_BODY + 32); + SSVAL(fixed, 26, dyn_len); + SSVAL(fixed, 28, outbuf_len); + + subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_FIND, 0, + state->fixed, sizeof(state->fixed), + dyn, dyn_len); + if (tevent_req_nomem(subreq, req)) { + return tevent_req_post(req, ev); + } + tevent_req_set_callback(subreq, smb2cli_query_directory_done, req); + return req; +} + +static void smb2cli_query_directory_done(struct tevent_req *subreq) +{ + struct tevent_req *req = + tevent_req_callback_data(subreq, + struct tevent_req); + struct smb2cli_query_directory_state *state = + tevent_req_data(req, + struct smb2cli_query_directory_state); + NTSTATUS status; + struct iovec *iov; + uint16_t data_offset; + + status = smb2cli_req_recv(subreq, talloc_tos(), &iov, 9); + if (tevent_req_nterror(req, status)) { + return; + } + + data_offset = SVAL(iov[1].iov_base, 2); + state->data_length = IVAL(iov[1].iov_base, 4); + + if ((data_offset != SMB2_HDR_BODY + 8) || + (state->data_length > iov[2].iov_len)) { + tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE); + return; + } + state->inbuf = smb2cli_req_inbuf(subreq); + state->data = (uint8_t *)iov[2].iov_base; + tevent_req_done(req); +} + +NTSTATUS smb2cli_query_directory_recv(struct tevent_req *req, + TALLOC_CTX *mem_ctx, + uint8_t **data, + uint32_t *data_length) +{ + struct smb2cli_query_directory_state *state = + tevent_req_data(req, + struct smb2cli_query_directory_state); + NTSTATUS status; + + if (tevent_req_is_nterror(req, &status)) { + return status; + } + talloc_steal(mem_ctx, state->inbuf); + *data_length = state->data_length; + *data = state->data; + return NT_STATUS_OK; +} + +NTSTATUS smb2cli_query_directory(struct cli_state *cli, + uint8_t level, + uint8_t flags, + uint32_t file_index, + uint64_t fid_persistent, + uint64_t fid_volatile, + const char *mask, + uint32_t outbuf_len, + TALLOC_CTX *mem_ctx, + uint8_t **data, + uint32_t *data_length) +{ + TALLOC_CTX *frame = talloc_stackframe(); + struct event_context *ev; + struct tevent_req *req; + NTSTATUS status = NT_STATUS_NO_MEMORY; + + if (cli_has_async_calls(cli)) { + /* + * Can't use sync call while an async call is in flight + */ + status = NT_STATUS_INVALID_PARAMETER; + goto fail; + } + ev = event_context_init(frame); + if (ev == NULL) { + goto fail; + } + req = smb2cli_query_directory_send(frame, ev, cli, level, flags, + file_index, fid_persistent, + fid_volatile, mask, outbuf_len); + if (req == NULL) { + goto fail; + } + if (!tevent_req_poll_ntstatus(req, ev, &status)) { + goto fail; + } + status = smb2cli_query_directory_recv(req, mem_ctx, + data, data_length); + fail: + TALLOC_FREE(frame); + return status; +} diff --git a/source3/wscript_build b/source3/wscript_build index 5bb3cc378fb..fdfba98beef 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -145,6 +145,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/smb2cli_flush.c libsmb/smb2cli_read.c libsmb/smb2cli_write.c + libsmb/smb2cli_query_directory.c libsmb/cli_np_tstream.c libsmb/reparse_symlink.c libsmb/clisymlink.c -- 2.11.4.GIT