summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2012-05-15 11:11:24 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-15 18:26:00 +0200
commitf50fc00306768424dee0680f7f9cae7ff0b3dcd8 (patch)
tree57de8fe95fe54248cc760dc06a122c2622038e4a /source3
parent269000b1b344fb04efe0f12ca455b584074139d3 (diff)
downloadsamba-f50fc00306768424dee0680f7f9cae7ff0b3dcd8.tar.gz
samba-f50fc00306768424dee0680f7f9cae7ff0b3dcd8.tar.bz2
samba-f50fc00306768424dee0680f7f9cae7ff0b3dcd8.zip
libcli/smb: move smb2cli_write.c from source3 to the toplevel
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/libsmb/smb2cli.h26
-rw-r--r--source3/libsmb/smb2cli_write.c163
-rwxr-xr-xsource3/wscript_build1
4 files changed, 1 insertions, 191 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f64bc5b322..b60186d52e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -625,7 +625,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
../libcli/smb/smb2cli_close.o \
libsmb/smb2cli_flush.o \
../libcli/smb/smb2cli_read.o \
- libsmb/smb2cli_write.o \
+ ../libcli/smb/smb2cli_write.o \
libsmb/smb2cli_query_directory.o \
libsmb/smb2cli_ioctl.o \
libsmb/smb2cli_query_info.o \
diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 0d7ee1faaf..2b3b7fe25d 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -53,32 +53,6 @@ NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
uint64_t fid_persistent,
uint64_t fid_volatile);
-struct tevent_req *smb2cli_write_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,
- uint32_t remaining_bytes,
- uint32_t flags,
- const uint8_t *data);
-NTSTATUS smb2cli_write_recv(struct tevent_req *req);
-NTSTATUS smb2cli_write(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,
- uint32_t remaining_bytes,
- uint32_t flags,
- const uint8_t *data);
-
struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbXcli_conn *conn,
diff --git a/source3/libsmb/smb2cli_write.c b/source3/libsmb/smb2cli_write.c
deleted file mode 100644
index d452ffb819..0000000000
--- a/source3/libsmb/smb2cli_write.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- 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 "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"
-
-struct smb2cli_write_state {
- uint8_t fixed[48];
- uint8_t dyn_pad[1];
-};
-
-static void smb2cli_write_done(struct tevent_req *subreq);
-
-struct tevent_req *smb2cli_write_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,
- uint32_t remaining_bytes,
- uint32_t flags,
- const uint8_t *data)
-{
- struct tevent_req *req, *subreq;
- struct smb2cli_write_state *state;
- uint8_t *fixed;
- const uint8_t *dyn;
- size_t dyn_len;
-
- req = tevent_req_create(mem_ctx, &state,
- struct smb2cli_write_state);
- if (req == NULL) {
- return NULL;
- }
-
- fixed = state->fixed;
-
- SSVAL(fixed, 0, 49);
- SSVAL(fixed, 2, SMB2_HDR_BODY + 48);
- SIVAL(fixed, 4, length);
- SBVAL(fixed, 8, offset);
- SBVAL(fixed, 16, fid_persistent);
- SBVAL(fixed, 24, fid_volatile);
- SIVAL(fixed, 36, remaining_bytes);
- SIVAL(fixed, 44, flags);
-
- if (length > 0) {
- dyn = data;
- dyn_len = length;
- } else {
- dyn = state->dyn_pad;;
- dyn_len = sizeof(state->dyn_pad);
- }
-
- subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_WRITE,
- 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_write_done, req);
- return req;
-}
-
-static void smb2cli_write_done(struct tevent_req *subreq)
-{
- struct tevent_req *req =
- tevent_req_callback_data(subreq,
- struct tevent_req);
- NTSTATUS status;
- static const struct smb2cli_req_expected_response expected[] = {
- {
- .status = NT_STATUS_OK,
- .body_size = 0x11
- }
- };
-
- status = smb2cli_req_recv(subreq, NULL, NULL,
- expected, ARRAY_SIZE(expected));
- if (tevent_req_nterror(req, status)) {
- return;
- }
- tevent_req_done(req);
-}
-
-NTSTATUS smb2cli_write_recv(struct tevent_req *req)
-{
- return tevent_req_simple_recv_ntstatus(req);
-}
-
-NTSTATUS smb2cli_write(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,
- uint32_t remaining_bytes,
- uint32_t flags,
- const uint8_t *data)
-{
- 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_write_send(frame, ev, conn, timeout_msec, session,
- tcon_id, length, offset,
- fid_persistent, fid_volatile,
- remaining_bytes, flags, data);
- if (req == NULL) {
- goto fail;
- }
- if (!tevent_req_poll_ntstatus(req, ev, &status)) {
- goto fail;
- }
- status = smb2cli_write_recv(req);
- fail:
- TALLOC_FREE(frame);
- return status;
-}
diff --git a/source3/wscript_build b/source3/wscript_build
index 9a68527013..89ccbefe64 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -132,7 +132,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clisigning.c
libsmb/smb2cli_tcon.c
libsmb/smb2cli_flush.c
- libsmb/smb2cli_write.c
libsmb/smb2cli_query_directory.c
libsmb/smb2cli_ioctl.c
libsmb/smb2cli_query_info.c