libcli/smb: move smb2cli_ioctl.c from source3 to the toplevel

Signed-off-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue May 15 20:17:01 CEST 2012 on sn-devel-104

4 files changed, 1 insertions, 374 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d8ed1b18f1..dce7f7719d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -627,7 +627,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     ../libcli/smb/smb2cli_read.o \
 	     ../libcli/smb/smb2cli_write.o \
 	     ../libcli/smb/smb2cli_query_directory.o \
-	     libsmb/smb2cli_ioctl.o \
+	     ../libcli/smb/smb2cli_ioctl.o \
 	     ../libcli/smb/smb2cli_query_info.o \
 	     ../libcli/smb/smb2cli_set_info.o \
 	     libsmb/cli_np_tstream.o \
diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 6425b8fdc0..10ea645734 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -37,39 +37,4 @@ struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx,
 NTSTATUS smb2cli_tdis_recv(struct tevent_req *req);
 NTSTATUS smb2cli_tdis(struct cli_state *cli);
 
-l
-struct tevent_req *smb2cli_ioctl_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,
-				      uint64_t in_fid_persistent,
-				      uint64_t in_fid_volatile,
-				      uint32_t in_ctl_code,
-				      uint32_t in_max_input_length,
-				      const DATA_BLOB *in_input_buffer,
-				      uint32_t in_max_output_length,
-				      const DATA_BLOB *in_output_buffer,
-				      uint32_t in_flags);
-NTSTATUS smb2cli_ioctl_recv(struct tevent_req *req,
-			    TALLOC_CTX *mem_ctx,
-			    DATA_BLOB *out_input_buffer,
-			    DATA_BLOB *out_output_buffer);
-NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
-		       uint32_t timeout_msec,
-		       struct smbXcli_session *session,
-		       uint32_t tcon_id,
-		       uint64_t in_fid_persistent,
-		       uint64_t in_fid_volatile,
-		       uint32_t in_ctl_code,
-		       uint32_t in_max_input_length,
-		       const DATA_BLOB *in_input_buffer,
-		       uint32_t in_max_output_length,
-		       const DATA_BLOB *in_output_buffer,
-		       uint32_t in_flags,
-		       TALLOC_CTX *mem_ctx,
-		       DATA_BLOB *out_input_buffer,
-		       DATA_BLOB *out_output_buffer);
-
 #endif /* __SMB2CLI_H__ */
diff --git a/source3/libsmb/smb2cli_ioctl.c b/source3/libsmb/smb2cli_ioctl.c
deleted file mode 100644
index c80ae49a58..0000000000
--- a/source3/libsmb/smb2cli_ioctl.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   smb2 lib
-   Copyright (C) Stefan Metzmacher 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 "client.h"
-#include "async_smb.h"
-#include "../libcli/smb/smbXcli_base.h"
-#include "smb2cli.h"
-#include "libsmb/proto.h"
-#include "lib/util/tevent_ntstatus.h"
-#include "../librpc/ndr/libndr.h"
-
-struct smb2cli_ioctl_state {
-	uint8_t fixed[0x38];
-	uint8_t dyn_pad[1];
-	uint32_t max_input_length;
-	uint32_t max_output_length;
-	struct iovec *recv_iov;
-	DATA_BLOB out_input_buffer;
-	DATA_BLOB out_output_buffer;
-};
-
-static void smb2cli_ioctl_done(struct tevent_req *subreq);
-
-struct tevent_req *smb2cli_ioctl_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,
-				      uint64_t in_fid_persistent,
-				      uint64_t in_fid_volatile,
-				      uint32_t in_ctl_code,
-				      uint32_t in_max_input_length,
-				      const DATA_BLOB *in_input_buffer,
-				      uint32_t in_max_output_length,
-				      const DATA_BLOB *in_output_buffer,
-				      uint32_t in_flags)
-{
-	struct tevent_req *req, *subreq;
-	struct smb2cli_ioctl_state *state;
-	uint8_t *fixed;
-	uint8_t *dyn;
-	size_t dyn_len;
-	uint32_t input_buffer_offset = 0;
-	uint32_t input_buffer_length = 0;
-	uint32_t output_buffer_offset = 0;
-	uint32_t output_buffer_length = 0;
-	uint32_t pad_length = 0;
-
-	req = tevent_req_create(mem_ctx, &state,
-				struct smb2cli_ioctl_state);
-	if (req == NULL) {
-		return NULL;
-	}
-	state->max_input_length = in_max_input_length;
-	state->max_output_length = in_max_output_length;
-
-	if (in_input_buffer) {
-		input_buffer_offset = SMB2_HDR_BODY+0x38;
-		input_buffer_length = in_input_buffer->length;
-	}
-
-	if (in_output_buffer) {
-		output_buffer_offset = SMB2_HDR_BODY+0x38;
-		if (input_buffer_length > 0) {
-			uint32_t tmp;
-			output_buffer_offset += input_buffer_length;
-			tmp = output_buffer_offset;
-			output_buffer_offset = NDR_ROUND(output_buffer_offset, 8);
-			pad_length = output_buffer_offset - tmp;
-		}
-		output_buffer_length = in_output_buffer->length;
-	}
-
-	fixed = state->fixed;
-
-	SSVAL(fixed, 0x00, 0x39);
-	SSVAL(fixed, 0x02, 0); /* reserved */
-	SIVAL(fixed, 0x04, in_ctl_code);
-	SBVAL(fixed, 0x08, in_fid_persistent);
-	SBVAL(fixed, 0x10, in_fid_volatile);
-	SIVAL(fixed, 0x18, input_buffer_offset);
-	SIVAL(fixed, 0x1C, input_buffer_length);
-	SIVAL(fixed, 0x20, in_max_input_length);
-	SIVAL(fixed, 0x24, output_buffer_offset);
-	SIVAL(fixed, 0x28, output_buffer_length);
-	SIVAL(fixed, 0x2C, in_max_output_length);
-	SIVAL(fixed, 0x30, in_flags);
-	SIVAL(fixed, 0x34, 0); /* reserved */
-
-	if (input_buffer_length > 0 && output_buffer_length > 0) {
-		size_t avail = UINT32_MAX - (input_buffer_length + pad_length);
-		size_t ofs = output_buffer_offset - input_buffer_offset;
-
-		if (avail < output_buffer_length) {
-			tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-			return tevent_req_post(req, ev);
-		}
-
-		dyn_len = input_buffer_length + output_buffer_length + pad_length;
-
-		dyn = talloc_zero_array(state, uint8_t, dyn_len);
-		if (tevent_req_nomem(dyn, req)) {
-			return tevent_req_post(req, ev);
-		}
-		memcpy(dyn, in_input_buffer->data,
-		       in_input_buffer->length);
-		memcpy(dyn + ofs, in_output_buffer->data,
-		       in_output_buffer->length);
-	} else if (input_buffer_length > 0) {
-		dyn = in_input_buffer->data;
-		dyn_len = in_input_buffer->length;
-	} else if (output_buffer_length > 0) {
-		dyn = in_output_buffer->data;
-		dyn_len = in_output_buffer->length;
-	} else {
-		dyn = state->dyn_pad;
-		dyn_len = sizeof(state->dyn_pad);
-	}
-
-	subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_IOCTL,
-				  0, 0, /* flags */
-				  timeout_msec,
-				  0xFEFF, /* pid */
-				  tcon_id,
-				  session,
-				  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_ioctl_done, req);
-	return req;
-}
-
-static void smb2cli_ioctl_done(struct tevent_req *subreq)
-{
-	struct tevent_req *req =
-		tevent_req_callback_data(subreq,
-		struct tevent_req);
-	struct smb2cli_ioctl_state *state =
-		tevent_req_data(req,
-		struct smb2cli_ioctl_state);
-	NTSTATUS status;
-	struct iovec *iov;
-	uint8_t *fixed;
-	uint8_t *dyn;
-	size_t dyn_len;
-	uint32_t dyn_ofs = SMB2_HDR_BODY + 0x30;
-	uint32_t input_buffer_offset;
-	uint32_t input_buffer_length;
-	uint32_t output_buffer_offset;
-	uint32_t output_buffer_length;
-	static const struct smb2cli_req_expected_response expected[] = {
-	{
-		.status = NT_STATUS_OK,
-		.body_size = 0x31
-	},
-	{
-		.status = STATUS_BUFFER_OVERFLOW,
-		.body_size = 0x31
-	}
-	};
-
-	status = smb2cli_req_recv(subreq, state, &iov,
-				  expected, ARRAY_SIZE(expected));
-	if (tevent_req_nterror(req, status)) {
-		return;
-	}
-
-	state->recv_iov = iov;
-	fixed = (uint8_t *)iov[1].iov_base;
-	dyn = (uint8_t *)iov[2].iov_base;
-	dyn_len = iov[2].iov_len;
-
-	input_buffer_offset = IVAL(fixed, 0x18);
-	input_buffer_length = IVAL(fixed, 0x1C);
-	output_buffer_offset = IVAL(fixed, 0x20);
-	output_buffer_length = IVAL(fixed, 0x24);
-
-	if ((input_buffer_offset > 0) && (input_buffer_length > 0)) {
-		uint32_t ofs;
-
-		if (input_buffer_offset != dyn_ofs) {
-			tevent_req_nterror(
-				req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-			return;
-		}
-
-		if (input_buffer_length < dyn_len) {
-			tevent_req_nterror(
-				req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-			return;
-		}
-
-		if (input_buffer_length > state->max_input_length) {
-			tevent_req_nterror(
-				req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-			return;
-		}
-
-		state->out_input_buffer.data = dyn;
-		state->out_input_buffer.length = input_buffer_length;
-
-		ofs = input_buffer_length;
-		ofs = NDR_ROUND(ofs, 8);
-
-		dyn_ofs += ofs;
-		dyn += ofs;
-		dyn_len -= ofs;
-	}
-
-	if ((output_buffer_offset > 0) && (output_buffer_length > 0)) {
-		if (output_buffer_offset != dyn_ofs) {
-			tevent_req_nterror(
-				req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-			return;
-		}
-
-		if (output_buffer_length < dyn_len) {
-			tevent_req_nterror(
-				req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-			return;
-		}
-
-		if (output_buffer_length > state->max_output_length) {
-			tevent_req_nterror(
-				req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-			return;
-		}
-
-		state->out_output_buffer.data = dyn;
-		state->out_output_buffer.length = output_buffer_length;
-	}
-
-	tevent_req_done(req);
-}
-
-NTSTATUS smb2cli_ioctl_recv(struct tevent_req *req,
-			    TALLOC_CTX *mem_ctx,
-			    DATA_BLOB *out_input_buffer,
-			    DATA_BLOB *out_output_buffer)
-{
-	struct smb2cli_ioctl_state *state =
-		tevent_req_data(req,
-		struct smb2cli_ioctl_state);
-	NTSTATUS status;
-
-	if (tevent_req_is_nterror(req, &status)) {
-		tevent_req_received(req);
-		return status;
-	}
-
-	talloc_steal(mem_ctx, state->recv_iov);
-	if (out_input_buffer) {
-		*out_input_buffer = state->out_input_buffer;
-	}
-	if (out_output_buffer) {
-		*out_output_buffer = state->out_output_buffer;
-	}
-
-	tevent_req_received(req);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
-		       uint32_t timeout_msec,
-		       struct smbXcli_session *session,
-		       uint32_t tcon_id,
-		       uint64_t in_fid_persistent,
-		       uint64_t in_fid_volatile,
-		       uint32_t in_ctl_code,
-		       uint32_t in_max_input_length,
-		       const DATA_BLOB *in_input_buffer,
-		       uint32_t in_max_output_length,
-		       const DATA_BLOB *in_output_buffer,
-		       uint32_t in_flags,
-		       TALLOC_CTX *mem_ctx,
-		       DATA_BLOB *out_input_buffer,
-		       DATA_BLOB *out_output_buffer)
-{
-	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_MIX;
-		goto fail;
-	}
-	ev = tevent_context_init(frame);
-	if (ev == NULL) {
-		goto fail;
-	}
-	req = smb2cli_ioctl_send(frame, ev, conn, timeout_msec,
-				 session, tcon_id,
-				 in_fid_persistent,
-				 in_fid_volatile,
-				 in_ctl_code,
-				 in_max_input_length,
-				 in_input_buffer,
-				 in_max_output_length,
-				 in_output_buffer,
-				 in_flags);
-	if (req == NULL) {
-		goto fail;
-	}
-	if (!tevent_req_poll_ntstatus(req, ev, &status)) {
-		goto fail;
-	}
-	status = smb2cli_ioctl_recv(req, mem_ctx,
-				    out_input_buffer,
-				    out_output_buffer);
- fail:
-	TALLOC_FREE(frame);
-	return status;
-}
diff --git a/source3/wscript_build b/source3/wscript_build
index 5d9779243b..7d8cd6510b 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -131,7 +131,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/async_smb.c
              libsmb/clisigning.c
              libsmb/smb2cli_tcon.c
-             libsmb/smb2cli_ioctl.c
              libsmb/cli_np_tstream.c
              libsmb/reparse_symlink.c
              libsmb/clisymlink.c