summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-05-15 12:07:28 +0200
committerStefan Metzmacher <metze@samba.org>2009-05-20 15:43:00 +0200
commit4abd5f34d97d759afd92ca854d9fffb382a4f999 (patch)
treef9fa75d012510866b4212793bf99113beb97e4e5
parentd7d73b08e993f6ca5948c3bbe653352573c6f43d (diff)
downloadsamba-4abd5f34d97d759afd92ca854d9fffb382a4f999.tar.gz
samba-4abd5f34d97d759afd92ca854d9fffb382a4f999.tar.bz2
samba-4abd5f34d97d759afd92ca854d9fffb382a4f999.zip
s3:smbd: add support for SMB2 Keepalive (SMB2 Echo)
metze
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/smbd/globals.h1
-rw-r--r--source3/smbd/smb2_keepalive.c55
-rw-r--r--source3/smbd/smb2_server.c36
4 files changed, 93 insertions, 0 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 53b7a3252a..f5074e3a78 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -749,6 +749,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
smbd/file_access.o \
smbd/dnsregister.o smbd/globals.o \
smbd/smb2_server.o smbd/smb2_negprot.o \
+ smbd/smb2_keepalive.o \
$(MANGLE_OBJ) @VFS_STATIC@
SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index d0935e10f1..c5dd97c7c8 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -218,6 +218,7 @@ NTSTATUS smbd_smb2_request_done(struct smbd_smb2_request *req,
DATA_BLOB body, DATA_BLOB *dyn);
NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req);
+NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req);
struct smbd_smb2_request {
TALLOC_CTX *mem_pool;
diff --git a/source3/smbd/smb2_keepalive.c b/source3/smbd/smb2_keepalive.c
new file mode 100644
index 0000000000..0028fd3608
--- /dev/null
+++ b/source3/smbd/smb2_keepalive.c
@@ -0,0 +1,55 @@
+/*
+ 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"
+
+NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req)
+{
+ const uint8_t *inbody;
+ int i = req->current_idx;
+ DATA_BLOB outbody;
+ size_t expected_body_size = 0x04;
+ size_t body_size;
+
+ 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);
+ }
+
+ /* TODO: update some time stamps */
+
+ outbody = data_blob_talloc(req->out.vector, NULL, 0x04);
+ if (outbody.data == NULL) {
+ return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
+ }
+
+ SSVAL(outbody.data, 0x00, 0x04); /* struct size */
+ SSVAL(outbody.data, 0x02, 0); /* reserved */
+
+ return smbd_smb2_request_done(req, outbody, NULL);
+}
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index f4e5dfabc5..9be6a73e13 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -293,22 +293,58 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
return smbd_smb2_request_process_negprot(req);
case SMB2_OP_SESSSETUP:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_LOGOFF:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
case SMB2_OP_TCON:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
case SMB2_OP_TDIS:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_CREATE:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_CLOSE:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_FLUSH:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_READ:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_WRITE:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_LOCK:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_IOCTL:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_CANCEL:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_KEEPALIVE:
+ return smbd_smb2_request_process_keepalive(req);
+
case SMB2_OP_FIND:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_NOTIFY:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_GETINFO:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_SETINFO:
+ return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
+
case SMB2_OP_BREAK:
return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED);
}