summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-06-02 13:42:28 +0200
committerStefan Metzmacher <metze@samba.org>2009-06-03 17:54:40 +0200
commitec0553bb6e66eb2125ae81421285e7ea9fa14e06 (patch)
treeaaa2435b4d23401fa3c40104c69333b1ea5685de
parent261c59e3a1ce9edc8c5db74e91a58988ebab6712 (diff)
downloadsamba-ec0553bb6e66eb2125ae81421285e7ea9fa14e06.tar.gz
samba-ec0553bb6e66eb2125ae81421285e7ea9fa14e06.tar.bz2
samba-ec0553bb6e66eb2125ae81421285e7ea9fa14e06.zip
s3:smbd: implement SMB2 Close
metze
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/smbd/globals.h1
-rw-r--r--source3/smbd/smb2_close.c132
-rw-r--r--source3/smbd/smb2_server.c2
4 files changed, 135 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 0430656382..0f3a74f08d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -753,6 +753,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
smbd/smb2_server.o smbd/smb2_negprot.o \
smbd/smb2_sesssetup.o smbd/smb2_tcon.o smbd/smb2_glue.o \
smbd/smb2_create.o \
+ smbd/smb2_close.o \
smbd/smb2_keepalive.o smbd/smb2_signing.o \
$(MANGLE_OBJ) @VFS_STATIC@
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index d377dc129b..cde2f20ae2 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -197,6 +197,7 @@ NTSTATUS smbd_smb2_request_process_logoff(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_tcon(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_tdis(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *req);
+NTSTATUS smbd_smb2_request_process_close(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req);
struct smbd_smb2_request {
diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
new file mode 100644
index 0000000000..a600498b2d
--- /dev/null
+++ b/source3/smbd/smb2_close.c
@@ -0,0 +1,132 @@
+/*
+ Unix SMB/CIFS implementation.
+ Core SMB2 server
+
+ Copyright (C) Stefan Metzmacher 2009
+
+ 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 "smbd/globals.h"
+#include "../source4/libcli/smb2/smb2_constants.h"
+
+static NTSTATUS smbd_smb2_close(struct smbd_smb2_request *req,
+ uint16_t in_flags,
+ uint64_t in_file_id_volatile);
+
+NTSTATUS smbd_smb2_request_process_close(struct smbd_smb2_request *req)
+{
+ const uint8_t *inhdr;
+ const uint8_t *inbody;
+ int i = req->current_idx;
+ uint8_t *outhdr;
+ DATA_BLOB outbody;
+ size_t expected_body_size = 0x18;
+ size_t body_size;
+ uint16_t in_flags;
+ uint64_t in_file_id_persistent;
+ uint64_t in_file_id_volatile;
+ NTSTATUS status;
+
+ inhdr = (const uint8_t *)req->in.vector[i+0].iov_base;
+ if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
+ return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+ }
+
+ inbody = (const uint8_t *)req->in.vector[i+1].iov_base;
+
+ body_size = SVAL(inbody, 0x00);
+ if (body_size != expected_body_size) {
+ return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+ }
+
+ in_flags = SVAL(inbody, 0x02);
+ in_file_id_persistent = BVAL(inbody, 0x08);
+ in_file_id_volatile = BVAL(inbody, 0x10);
+
+ if (in_file_id_persistent != 0) {
+ return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
+ }
+
+ status = smbd_smb2_close(req,
+ in_flags,
+ in_file_id_volatile);
+ if (!NT_STATUS_IS_OK(status)) {
+ return smbd_smb2_request_error(req, status);
+ }
+
+ outhdr = (uint8_t *)req->out.vector[i].iov_base;
+
+ outbody = data_blob_talloc(req->out.vector, NULL, 0x3C);
+ if (outbody.data == NULL) {
+ return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
+ }
+
+ SSVAL(outbody.data, 0x00, 0x3C); /* struct size */
+ SSVAL(outbody.data, 0x02, 0); /* flags */
+ SIVAL(outbody.data, 0x04, 0); /* reserved */
+ SBVAL(outbody.data, 0x08, 0); /* creation time */
+ SBVAL(outbody.data, 0x10, 0); /* last access time */
+ SBVAL(outbody.data, 0x18, 0); /* last write time */
+ SBVAL(outbody.data, 0x20, 0); /* change time */
+ SBVAL(outbody.data, 0x28, 0); /* allocation size */
+ SBVAL(outbody.data, 0x30, 0); /* end of size */
+ SIVAL(outbody.data, 0x38, 0); /* file attributes */
+
+ return smbd_smb2_request_done(req, outbody, NULL);
+}
+
+static NTSTATUS smbd_smb2_close(struct smbd_smb2_request *req,
+ uint16_t in_flags,
+ uint64_t in_file_id_volatile)
+{
+ NTSTATUS status;
+ struct smb_request *smbreq;
+ connection_struct *conn = req->tcon->compat_conn;
+ files_struct *fsp;
+
+ DEBUG(10,("smbd_smb2_close: file_id[0x%016llX]\n",
+ (unsigned long long)in_file_id_volatile));
+
+ smbreq = smbd_smb2_fake_smb_request(req);
+ if (smbreq == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ /* If it's an IPC, pass off the pipe handler. */
+ if (IS_IPC(conn)) {
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ fsp = file_fsp(smbreq, (uint16_t)in_file_id_volatile);
+ if (fsp == NULL) {
+ return NT_STATUS_FILE_CLOSED;
+ }
+ if (conn != fsp->conn) {
+ return NT_STATUS_FILE_CLOSED;
+ }
+ if (req->session->vuid != fsp->vuid) {
+ return NT_STATUS_FILE_CLOSED;
+ }
+
+ status = close_file(smbreq, fsp, NORMAL_CLOSE);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(5,("smbd_smb2_close: close_file[%s]: %s\n",
+ fsp->fsp_name, nt_errstr(status)));
+ return status;
+ }
+
+ return NT_STATUS_OK;
+}
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 75e86e0d31..611e1b382c 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -378,7 +378,7 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
if (!NT_STATUS_IS_OK(status)) {
return smbd_smb2_request_error(req, status);
}
- return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+ return smbd_smb2_request_process_close(req);
case SMB2_OP_FLUSH:
if (!NT_STATUS_IS_OK(session_status)) {