From aca64f642da78e777b113a6b25342f18fc18c502 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 14 May 2012 09:47:05 +0200 Subject: [PATCH] libcli/smb: move smb2cli_logoff_* from source3 to the top level metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Mon May 14 17:02:46 CEST 2012 on sn-devel-104 --- libcli/smb/smb2cli_session.c | 100 ++++++++++++++++++++++++++++++ libcli/smb/smbXcli_base.h | 10 +++ source3/Makefile.in | 1 - source3/libsmb/smb2cli.h | 10 --- source3/libsmb/smb2cli_session.c | 130 --------------------------------------- source3/wscript_build | 1 - 6 files changed, 110 insertions(+), 142 deletions(-) delete mode 100644 source3/libsmb/smb2cli_session.c diff --git a/libcli/smb/smb2cli_session.c b/libcli/smb/smb2cli_session.c index b69f0a2a935..640eb95f0b3 100644 --- a/libcli/smb/smb2cli_session.c +++ b/libcli/smb/smb2cli_session.c @@ -230,4 +230,104 @@ NTSTATUS smb2cli_session_setup_recv(struct tevent_req *req, return status; } +struct smb2cli_logoff_state { + uint8_t fixed[4]; +}; + +static void smb2cli_logoff_done(struct tevent_req *subreq); + +struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session) +{ + struct tevent_req *req, *subreq; + struct smb2cli_logoff_state *state; + + req = tevent_req_create(mem_ctx, &state, + struct smb2cli_logoff_state); + if (req == NULL) { + return NULL; + } + SSVAL(state->fixed, 0, 4); + + subreq = smb2cli_req_send(state, ev, + conn, SMB2_OP_LOGOFF, + 0, 0, /* flags */ + timeout_msec, + 0xFEFF, /* pid */ + 0, /* tid */ + 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_logoff_done, req); + return req; +} + +static void smb2cli_logoff_done(struct tevent_req *subreq) +{ + struct tevent_req *req = + tevent_req_callback_data(subreq, + struct tevent_req); + struct smb2cli_logoff_state *state = + tevent_req_data(req, + struct smb2cli_logoff_state); + NTSTATUS status; + struct iovec *iov; + static const struct smb2cli_req_expected_response expected[] = { + { + .status = NT_STATUS_OK, + .body_size = 0x04 + } + }; + + status = smb2cli_req_recv(subreq, state, &iov, + expected, ARRAY_SIZE(expected)); + TALLOC_FREE(subreq); + if (tevent_req_nterror(req, status)) { + return; + } + tevent_req_done(req); +} +NTSTATUS smb2cli_logoff_recv(struct tevent_req *req) +{ + return tevent_req_simple_recv_ntstatus(req); +} + +NTSTATUS smb2cli_logoff(struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session) +{ + 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_logoff_send(frame, ev, conn, timeout_msec, session); + if (req == NULL) { + goto fail; + } + if (!tevent_req_poll_ntstatus(req, ev, &status)) { + goto fail; + } + status = smb2cli_logoff_recv(req); + fail: + TALLOC_FREE(frame); + return status; +} diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 91dc2448351..81fb1fd5826 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -280,4 +280,14 @@ NTSTATUS smb2cli_session_setup_recv(struct tevent_req *req, struct iovec **recv_iov, DATA_BLOB *out_security_buffer); +struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session); +NTSTATUS smb2cli_logoff_recv(struct tevent_req *req); +NTSTATUS smb2cli_logoff(struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session); + #endif /* _SMBXCLI_BASE_H_ */ diff --git a/source3/Makefile.in b/source3/Makefile.in index 466cd637d4e..52ed5d34502 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -618,7 +618,6 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ ../libcli/smb/smbXcli_base.o \ ../libcli/smb/smb1cli_trans.o \ ../libcli/smb/smb2cli_session.o \ - libsmb/smb2cli_session.o \ libsmb/smb2cli_tcon.o \ libsmb/smb2cli_create.o \ ../libcli/smb/smb2_create_blob.o \ diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h index bd6b1316696..003e0de9567 100644 --- a/source3/libsmb/smb2cli.h +++ b/source3/libsmb/smb2cli.h @@ -24,16 +24,6 @@ struct smbXcli_conn; struct smbXcli_session; struct cli_state; -struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session); -NTSTATUS smb2cli_logoff_recv(struct tevent_req *req); -NTSTATUS smb2cli_logoff(struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session); - struct tevent_req *smb2cli_tcon_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c deleted file mode 100644 index 385cca461ea..00000000000 --- a/source3/libsmb/smb2cli_session.c +++ /dev/null @@ -1,130 +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 . -*/ - -#include "includes.h" -#include "client.h" -#include "async_smb.h" -#include "smb2cli.h" -#include "../libcli/smb/smbXcli_base.h" -#include "libsmb/proto.h" -#include "lib/util/tevent_ntstatus.h" -#include "../libcli/auth/spnego.h" -#include "../auth/ntlmssp/ntlmssp.h" - -struct smb2cli_logoff_state { - uint8_t fixed[4]; -}; - -static void smb2cli_logoff_done(struct tevent_req *subreq); - -struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session) -{ - struct tevent_req *req, *subreq; - struct smb2cli_logoff_state *state; - - req = tevent_req_create(mem_ctx, &state, - struct smb2cli_logoff_state); - if (req == NULL) { - return NULL; - } - SSVAL(state->fixed, 0, 4); - - subreq = smb2cli_req_send(state, ev, - conn, SMB2_OP_LOGOFF, - 0, 0, /* flags */ - timeout_msec, - 0xFEFF, /* pid */ - 0, /* tid */ - 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_logoff_done, req); - return req; -} - -static void smb2cli_logoff_done(struct tevent_req *subreq) -{ - struct tevent_req *req = - tevent_req_callback_data(subreq, - struct tevent_req); - struct smb2cli_logoff_state *state = - tevent_req_data(req, - struct smb2cli_logoff_state); - NTSTATUS status; - struct iovec *iov; - static const struct smb2cli_req_expected_response expected[] = { - { - .status = NT_STATUS_OK, - .body_size = 0x04 - } - }; - - status = smb2cli_req_recv(subreq, state, &iov, - expected, ARRAY_SIZE(expected)); - TALLOC_FREE(subreq); - if (tevent_req_nterror(req, status)) { - return; - } - tevent_req_done(req); -} - -NTSTATUS smb2cli_logoff_recv(struct tevent_req *req) -{ - return tevent_req_simple_recv_ntstatus(req); -} - -NTSTATUS smb2cli_logoff(struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session) -{ - 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_logoff_send(frame, ev, conn, timeout_msec, session); - if (req == NULL) { - goto fail; - } - if (!tevent_req_poll_ntstatus(req, ev, &status)) { - goto fail; - } - status = smb2cli_logoff_recv(req); - fail: - TALLOC_FREE(frame); - return status; -} diff --git a/source3/wscript_build b/source3/wscript_build index adc98925199..99d7bd80748 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -130,7 +130,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/clioplock.c libsmb/clirap2.c libsmb/async_smb.c libsmb/clisigning.c - libsmb/smb2cli_session.c libsmb/smb2cli_tcon.c libsmb/smb2cli_create.c libsmb/smb2cli_close.c -- 2.11.4.GIT