summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/torture/config.mk5
-rw-r--r--source4/torture/smb2/config.mk10
-rw-r--r--source4/torture/smb2/connect.c74
-rw-r--r--source4/torture/torture.c4
4 files changed, 91 insertions, 2 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 2ecde30b65..c6bc4a09f6 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -26,7 +26,7 @@ REQUIRED_SUBSYSTEMS = \
#################################
#################################
-# Start SUBSYSTEM TORTURE_BASIC
+# Start SUBSYSTEM TORTURE_RAW
[SUBSYSTEM::TORTURE_RAW]
ADD_OBJ_FILES = \
raw/qfsinfo.o \
@@ -57,6 +57,8 @@ REQUIRED_SUBSYSTEMS = \
# End SUBSYSTEM TORTURE_RAW
#################################
+include smb2/config.mk
+
#################################
# Start SUBSYSTEM TORTURE_COM
[SUBSYSTEM::TORTURE_COM]
@@ -224,6 +226,7 @@ OBJ_FILES = \
REQUIRED_SUBSYSTEMS = \
TORTURE_BASIC \
TORTURE_RAW \
+ TORTURE_SMB2 \
TORTURE_RPC \
TORTURE_RAP \
TORTURE_AUTH \
diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
new file mode 100644
index 0000000000..d171942109
--- /dev/null
+++ b/source4/torture/smb2/config.mk
@@ -0,0 +1,10 @@
+
+#################################
+# Start SUBSYSTEM TORTURE_SMB2
+[SUBSYSTEM::TORTURE_SMB2]
+ADD_OBJ_FILES = \
+ connect.o
+REQUIRED_SUBSYSTEMS = \
+ LIBCLI_SMB2
+# End SUBSYSTEM TORTURE_SMB2
+#################################
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
new file mode 100644
index 0000000000..00a9b35c17
--- /dev/null
+++ b/source4/torture/smb2/connect.c
@@ -0,0 +1,74 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ test suite for SMB2 connection operations
+
+ Copyright (C) Andrew Tridgell 2005
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/smb2/smb2.h"
+#include "librpc/gen_ndr/ndr_security.h"
+#include "lib/cmdline/popt_common.h"
+#include "lib/events/events.h"
+
+#define BASEDIR "\\testsmb2"
+
+#define CHECK_STATUS(status, correct) do { \
+ if (!NT_STATUS_EQUAL(status, correct)) { \
+ printf("(%s) Incorrect status %s - should be %s\n", \
+ __location__, nt_errstr(status), nt_errstr(correct)); \
+ ret = False; \
+ goto done; \
+ }} while (0)
+
+/*
+ basic testing of SMB2 connection calls
+*/
+BOOL torture_smb2_connect(void)
+{
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
+ struct smbcli_socket *socket;
+ struct smb2_transport *transport;
+ const char *host = lp_parm_string(-1, "torture", "host");
+ BOOL ret = True;
+ NTSTATUS status;
+
+ socket = smbcli_sock_connect_byname(host, 445, mem_ctx, NULL);
+ if (socket == NULL) {
+ printf("Failed to connect to %s\n", host);
+ return False;
+ }
+
+ transport = smb2_transport_init(socket, mem_ctx);
+ if (socket == NULL) {
+ printf("Failed to setup smb2 transport\n");
+ return False;
+ }
+
+ /* send a negprot */
+ status = smb2_negprot(transport);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf("negprot failed - %s\n", nt_errstr(status));
+ return False;
+ }
+
+ talloc_free(mem_ctx);
+
+ return ret;
+}
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index ed09ddb213..869ff8926d 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -902,7 +902,6 @@ static BOOL run_negprot_nowait(void)
for (i=0;i<1000;i++) {
struct smbcli_request *req;
- time_t t1 = time(NULL);
req = smb_raw_negotiate_send(cli->transport, PROTOCOL_NT1);
smbcli_transport_process(cli->transport);
if (req->state == SMBCLI_REQUEST_ERROR) {
@@ -2252,6 +2251,9 @@ static struct {
{"RAW-RAP", torture_raw_rap, 0},
{"RAW-COMPOSITE", torture_raw_composite, 0},
+ /* SMB2 tests */
+ {"SMB2-CONNECT", torture_smb2_connect, 0},
+
/* protocol scanners */
{"SCAN-TRANS2", torture_trans2_scan, 0},
{"SCAN-NTTRANS", torture_nttrans_scan, 0},