diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/libsmb/smb2cli.h | 16 | ||||
| -rw-r--r-- | source3/libsmb/smb2cli_flush.c | 133 | ||||
| -rwxr-xr-x | source3/wscript_build | 1 |
4 files changed, 1 insertions, 151 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index b60186d52e..e45e7fd1ac 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -623,7 +623,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ ../libcli/smb/smb2_create_blob.o \ ../libcli/smb/smb2_signing.o \ ../libcli/smb/smb2cli_close.o \ - libsmb/smb2cli_flush.o \ + ../libcli/smb/smb2cli_flush.o \ ../libcli/smb/smb2cli_read.o \ ../libcli/smb/smb2cli_write.o \ libsmb/smb2cli_query_directory.o \ diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h index 2b3b7fe25d..8c8aa3200b 100644 --- a/source3/libsmb/smb2cli.h +++ b/source3/libsmb/smb2cli.h @@ -37,22 +37,6 @@ 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); -struct tevent_req *smb2cli_flush_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 fid_persistent, - uint64_t fid_volatile); -NTSTATUS smb2cli_flush_recv(struct tevent_req *req); -NTSTATUS smb2cli_flush(struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session, - uint32_t tcon_id, - uint64_t fid_persistent, - uint64_t fid_volatile); - 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_flush.c b/source3/libsmb/smb2cli_flush.c deleted file mode 100644 index 514fc93872..0000000000 --- a/source3/libsmb/smb2cli_flush.c +++ /dev/null @@ -1,133 +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_flush_state { - uint8_t fixed[24]; -}; - -static void smb2cli_flush_done(struct tevent_req *subreq); - -struct tevent_req *smb2cli_flush_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 fid_persistent, - uint64_t fid_volatile) -{ - struct tevent_req *req, *subreq; - struct smb2cli_flush_state *state; - uint8_t *fixed; - - req = tevent_req_create(mem_ctx, &state, - struct smb2cli_flush_state); - if (req == NULL) { - return NULL; - } - fixed = state->fixed; - SSVAL(fixed, 0, 24); - SBVAL(fixed, 8, fid_persistent); - SBVAL(fixed, 16, fid_volatile); - - subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_FLUSH, - 0, 0, /* flags */ - timeout_msec, - 0xFEFF, /* pid */ - tcon_id, - session, - state->fixed, sizeof(state->fixed), - NULL, 0); - if (tevent_req_nomem(subreq, req)) { - return tevent_req_post(req, ev); - } - tevent_req_set_callback(subreq, smb2cli_flush_done, req); - return req; -} - -static void smb2cli_flush_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 = 0x04 - } - }; - - status = smb2cli_req_recv(subreq, NULL, NULL, - expected, ARRAY_SIZE(expected)); - if (tevent_req_nterror(req, status)) { - return; - } - tevent_req_done(req); -} - -NTSTATUS smb2cli_flush_recv(struct tevent_req *req) -{ - return tevent_req_simple_recv_ntstatus(req); -} - -NTSTATUS smb2cli_flush(struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session, - uint32_t tcon_id, - uint64_t fid_persistent, - uint64_t fid_volatile) -{ - 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_flush_send(frame, ev, conn, timeout_msec, session, - tcon_id, fid_persistent, fid_volatile); - if (req == NULL) { - goto fail; - } - if (!tevent_req_poll_ntstatus(req, ev, &status)) { - goto fail; - } - status = smb2cli_flush_recv(req); - fail: - TALLOC_FREE(frame); - return status; -} diff --git a/source3/wscript_build b/source3/wscript_build index 89ccbefe64..4f44b0c5a1 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_flush.c libsmb/smb2cli_query_directory.c libsmb/smb2cli_ioctl.c libsmb/smb2cli_query_info.c |