Split test1 off test_multichannel_lease_break()

Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>

diff --git a/source4/torture/smb2/multichannel.c b/source4/torture/smb2/multichannel.c
index 77bace972e2c8a0cb9dd1f2219e45794120d38bc..0f8678749ca41fe04d9262b435f38d167497db9a 100644 (file)
--- a/source4/torture/smb2/multichannel.c
+++ b/source4/torture/smb2/multichannel.c
@@ -828,10 +828,21 @@ static const uint64_t LEASE2F1 = 0xDEADBEEFFEEDBEADull;
 static const uint64_t LEASE2F2 = 0xDAD0FFEDD00DF00Dull;
 static const uint64_t LEASE2F3 = 0xBAD0FFEDD00DF00Dull;
 
-static bool test_multichannel_lease_break(struct torture_context *tctx,
-                                         struct smb2_tree *tree1)
+/*
+ * Test 1:
+ *     open file1 in session 2A
+ *     open file2 in session 2B
+ *     open file3 in session 2C
+ *     open file1 in session 1
+ *             lease break sent to 2A
+ *     open file2 in session 1
+ *             lease break sent to 2A
+ *     open file3 in session 1
+ *             lease break sent to 2A
+ */
+static bool test_multichannel_lease_break_test1(struct torture_context *tctx,
+                                               struct smb2_tree *tree1)
 {
-
        const char *host = torture_setting_string(tctx, "host", NULL);
        const char *share = torture_setting_string(tctx, "share", NULL);
        struct cli_credentials *credentials = popt_get_cmdline_credentials();
@@ -866,7 +877,6 @@ static bool test_multichannel_lease_break(struct torture_context *tctx,
        struct smb2_lease ls1;
        struct smb2_lease ls2;
        struct smb2_lease ls3;
-       DATA_BLOB blob;
 
        if (!test_multichannel_initial_checks(tctx, tree1))
                return true;
@@ -901,16 +911,6 @@ static bool test_multichannel_lease_break(struct torture_context *tctx,
 
        transport2_options = transport1->options;
 
-       /*
-        * Test 1:
-        *      open file1 in session 2A
-        *      open file2 in session 2B
-        *      open file3 in session 2B
-        *      open file1 in session 1
-        *              lease break sent to 2A
-        *      open file2 in session 2
-        *              lease break sent to 2B
-        */
        torture_comment(tctx, "Test 1 start \n");
 
        rval = test_multichannel_create_channels2(tctx, host, share,
@@ -947,11 +947,11 @@ static bool test_multichannel_lease_break(struct torture_context *tctx,
        CHECK_VAL(io2.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 0);
 
-       /* 2b opens file3 */
-       torture_comment(tctx, "client2 opens fname3 via session 2B\n");
+       /* 2c opens file3 */
+       torture_comment(tctx, "client2 opens fname3 via session 2C\n");
        smb2_lease_create(&io3, &ls3, false, fname3, LEASE2F3,
                          smb2_util_lease_state("RHW"));
-       status = smb2_create(tree2B, mem_ctx, &io3);
+       status = smb2_create(tree2C, mem_ctx, &io3);
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client2_file3 = io3.out.file.handle;
        CHECK_CREATED(&io3, CREATED, FILE_ATTRIBUTE_ARCHIVE);
@@ -1003,6 +1003,29 @@ static bool test_multichannel_lease_break(struct torture_context *tctx,
        CHECK_VAL(lease_break_info.count, 1);
        CHECK_PTR(lease_break_info.lease_transport, transport2A);
 
+       torture_reset_lease_break_info(tctx, &lease_break_info);
+
+       /*
+        * 1 opens file3
+        * lease break?
+        */
+
+       torture_comment(tctx, "client1 opens fname3 via session 1\n");
+       smb2_lease_create(&io3, &ls3, false, fname3, LEASE1F3,
+                         smb2_util_lease_state("RHW"));
+       status = smb2_create(tree1, mem_ctx, &io3);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       h_client1_file3 = io3.out.file.handle;
+       CHECK_CREATED(&io3, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_LEASE(&io3, "RH", true, LEASE1F3, 0);
+       CHECK_BREAK_INFO("RHW", "RH", LEASE2F3);
+       CHECK_VAL(io3.out.durable_open_v2, false);
+       CHECK_VAL(io3.out.timeout, 0);
+       CHECK_VAL(io3.out.durable_open, false);
+       CHECK_VAL(lease_break_info.count, 1);
+       CHECK_PTR(lease_break_info.lease_transport, transport2A);
+
+
        /* cleanup everything */
        torture_reset_lease_break_info(tctx, &lease_break_info);
 
@@ -1019,6 +1042,113 @@ static bool test_multichannel_lease_break(struct torture_context *tctx,
        CHECK_VAL(lease_break_info.count, 0);
        test_multichannel_free_channels2(tree2A, tree2B, tree2C);
        tree2A = tree2B = tree2C = NULL;
+done:
+       if (block_ok && !unblock_ok) {
+               /* unblock tcp connection of transport2C */
+               unblock_ok = torture_unblock_tcp_transport(tctx, transport2C);
+               unblock_ok = torture_unblock_tcp_transport(tctx, transport2A);
+               unblock_ok = torture_unblock_tcp_transport(tctx, transport2B);
+       }
+
+       tree1->session = session1;
+
+       smb2_util_close(tree1, h_client1_file1);
+       smb2_util_close(tree1, h_client1_file2);
+       smb2_util_close(tree1, h_client1_file3);
+       if (tree2A != NULL) {
+               smb2_util_close(tree2A, h_client2_file1);
+               smb2_util_close(tree2A, h_client2_file2);
+               smb2_util_close(tree2A, h_client2_file3);
+       }
+
+       if (h != NULL) {
+               smb2_util_close(tree1, *h);
+       }
+
+       smb2_util_unlink(tree1, fname1);
+       smb2_util_unlink(tree1, fname2);
+       smb2_util_unlink(tree1, fname3);
+       smb2_deltree(tree1, BASEDIR);
+
+       test_multichannel_free_channels2(tree2A, tree2B, tree2C);
+       talloc_free(tree1);
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+static bool test_multichannel_lease_break(struct torture_context *tctx,
+                                         struct smb2_tree *tree1)
+{
+
+       const char *host = torture_setting_string(tctx, "host", NULL);
+       const char *share = torture_setting_string(tctx, "share", NULL);
+       struct cli_credentials *credentials = popt_get_cmdline_credentials();
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       struct smb2_handle h_client1_file1 = { 0 };
+       struct smb2_handle h_client1_file2 = { 0 };
+       struct smb2_handle h_client1_file3 = { 0 };
+       struct smb2_handle h_client2_file1 = { 0 };
+       struct smb2_handle h_client2_file2 = { 0 };
+       struct smb2_handle h_client2_file3 = { 0 };
+       struct smb2_create io1, io2, io3;
+       bool ret = true;
+       int rval;
+       const char *fname1 = BASEDIR "\\lease_break_test1.dat";
+       const char *fname2 = BASEDIR "\\lease_break_test2.dat";
+       const char *fname3 = BASEDIR "\\lease_break_test3.dat";
+       struct smb2_tree *tree2A = NULL;
+       struct smb2_tree *tree2B = NULL;
+       struct smb2_tree *tree2C = NULL;
+       struct smb2_transport *transport1 = tree1->session->transport;
+       struct smb2_transport *transport2A = NULL;
+       struct smb2_transport *transport2B = NULL;
+       struct smb2_transport *transport2C = NULL;
+       struct smbcli_options transport2_options;
+       struct smb2_session *session1 = tree1->session;
+       uint16_t local_port = 0;
+       bool block_ok = false;
+       bool unblock_ok = false;
+       struct smb2_lease ls1;
+       struct smb2_lease ls2;
+       struct smb2_lease ls3;
+       DATA_BLOB blob;
+
+       if (!test_multichannel_initial_checks(tctx, tree1))
+               return true;
+
+       torture_reset_lease_break_info(tctx, &lease_break_info);
+
+       transport1->lease.handler = torture_lease_handler;
+       transport1->lease.private_data = tree1;
+       torture_comment(tctx, "transport1  [%p]\n", transport1);
+       local_port = torture_get_local_port_from_transport(transport1);
+       torture_comment(tctx, "transport1 uses tcp port: %d\n", local_port);
+
+       status = torture_smb2_testdir(tree1, BASEDIR, &_h);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       smb2_util_close(tree1, _h);
+       smb2_util_unlink(tree1, fname1);
+       smb2_util_unlink(tree1, fname2);
+       smb2_util_unlink(tree1, fname3);
+       CHECK_VAL(lease_break_info.count, 0);
+
+       smb2_lease_create(&io1, &ls1, false, fname1, LEASE2F1,
+                         smb2_util_lease_state("RHW"));
+       test_multichannel_init_smb_create(&io1);
+
+       smb2_lease_create(&io2, &ls2, false, fname2, LEASE2F2,
+                         smb2_util_lease_state("RHW"));
+       test_multichannel_init_smb_create(&io2);
+
+       smb2_lease_create(&io3, &ls3, false, fname3, LEASE2F3,
+                         smb2_util_lease_state("RHW"));
+       test_multichannel_init_smb_create(&io3);
+
+       transport2_options = transport1->options;
 
        /*
         * Test 2:
@@ -1422,7 +1552,7 @@ static bool test_multichannel_lease_break(struct torture_context *tctx,
        test_multichannel_free_channels2(tree2A, tree2B, tree2C);
        tree2A = tree2B = tree2C = NULL;
 
- done:
+done:
        if (block_ok && !unblock_ok) {
                /* unblock tcp connection of transport2C */
                unblock_ok = torture_unblock_tcp_transport(tctx, transport2C);
@@ -1570,6 +1700,7 @@ struct torture_suite *torture_smb2_multichannel_init(TALLOC_CTX *ctx)
        torture_suite_add_1smb2_test(suite, "interface_info", test_multichannel_interface_info);
        torture_suite_add_1smb2_test(suite, "oplock_break", test_multichannel_oplock_break);
        torture_suite_add_1smb2_test(suite, "lease_break", test_multichannel_lease_break);
+       torture_suite_add_1smb2_test(suite, "lease_break_test1", test_multichannel_lease_break_test1);
        torture_suite_add_1smb2_test(suite, "num_channels", test_multichannel_num_channels);
 
        suite->description = talloc_strdup(suite, "SMB2 Multichannel tests");