Finish removal of iconv_convenience in public API's.

[bbaumbach/samba-autobuild/.git] / source4 / torture / basic / scanner.c

diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 6ccd4ba1ccacd1920b7987d1e2528a5fd990e055..a4d8674db9b8e9fac766908dc2eb2b03d4c4563f 100644 (file)
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -18,10 +18,8 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "system/filesys.h"
 #include "param/param.h"
@@ -65,8 +63,8 @@ static NTSTATUS try_trans2(struct smbcli_state *cli,
 
        mem_ctx = talloc_init("try_trans2");
 
-       t2.in.max_param = 64;
-       t2.in.max_data = smb_raw_max_trans_data(cli->tree, 64);
+       t2.in.max_param = UINT16_MAX;
+       t2.in.max_data = UINT16_MAX;
        t2.in.max_setup = 10;
        t2.in.flags = 0;
        t2.in.timeout = 0;
@@ -163,7 +161,7 @@ static bool trans2_op_exists(struct smbcli_state *cli, int op)
 /****************************************************************************
 check for existance of a trans2 call
 ****************************************************************************/
-static bool scan_trans2(struct smb_iconv_convenience *iconv_convenience, 
+static bool scan_trans2(
                        struct smbcli_state *cli, int op, int level,
                        int fnum, int dnum, int qfnum, const char *fname)
 {
@@ -233,7 +231,7 @@ static bool scan_trans2(struct smb_iconv_convenience *iconv_convenience,
        SSVAL(param, 0, level);
        SSVAL(param, 2, 0);
        SSVAL(param, 4, 0);
-       param_len += push_string(iconv_convenience,
+       param_len += push_string(
                        &param[6], fname, PARAM_SIZE-7,
                        STR_TERMINATE|STR_UNICODE);
 
@@ -249,7 +247,7 @@ static bool scan_trans2(struct smb_iconv_convenience *iconv_convenience,
        SSVAL(param, 0, level);
        SSVAL(param, 2, 0);
        SSVAL(param, 4, 0);
-       param_len += push_string(iconv_convenience,
+       param_len += push_string(
                        &param[6], "\\newfile.dat", PARAM_SIZE-7,
                        STR_TERMINATE|STR_UNICODE);
 
@@ -266,7 +264,7 @@ static bool scan_trans2(struct smb_iconv_convenience *iconv_convenience,
        smbcli_mkdir(cli->tree, "\\testdir");
        param_len = 2;
        SSVAL(param, 0, level);
-       param_len += push_string(iconv_convenience,
+       param_len += push_string(
                        &param[2], "\\testdir", PARAM_SIZE-3,
                        STR_TERMINATE|STR_UNICODE);
 
@@ -321,15 +319,15 @@ bool torture_trans2_scan(struct torture_context *torture,
                }
 
                for (level = 0; level <= 50; level++) {
-                       scan_trans2(lp_iconv_convenience(torture->lp_ctx), cli, op, level, fnum, dnum, qfnum, fname);
+                       scan_trans2(cli, op, level, fnum, dnum, qfnum, fname);
                }
 
                for (level = 0x100; level <= 0x130; level++) {
-                       scan_trans2(lp_iconv_convenience(torture->lp_ctx), cli, op, level, fnum, dnum, qfnum, fname);
+                       scan_trans2(cli, op, level, fnum, dnum, qfnum, fname);
                }
 
                for (level = 1000; level < 1050; level++) {
-                       scan_trans2(lp_iconv_convenience(torture->lp_ctx), cli, op, level, fnum, dnum, qfnum, fname);
+                       scan_trans2(cli, op, level, fnum, dnum, qfnum, fname);
                }
        }
 
@@ -378,8 +376,8 @@ static NTSTATUS try_nttrans(struct smbcli_state *cli,
        ntdata_blob.length = data_len;
        ntdata_blob.data = data;
 
-       parms.in.max_param = 64;
-       parms.in.max_data = smb_raw_max_trans_data(cli->tree, 64);
+       parms.in.max_param = UINT32_MAX;
+       parms.in.max_data = UINT32_MAX;
        parms.in.max_setup = 0;
        parms.in.setup_count = 0;
        parms.in.function = op;
@@ -437,8 +435,7 @@ static NTSTATUS try_nttrans_len(struct smbcli_state *cli,
 /****************************************************************************
 check for existance of a nttrans call
 ****************************************************************************/
-static bool scan_nttrans(struct smb_iconv_convenience *iconv_convenience,
-                        struct smbcli_state *cli, int op, int level,
+static bool scan_nttrans(struct smbcli_state *cli, int op, int level,
                        int fnum, int dnum, const char *fname)
 {
        int data_len = 0;
@@ -494,7 +491,7 @@ static bool scan_nttrans(struct smb_iconv_convenience *iconv_convenience,
        SSVAL(param, 0, level);
        SSVAL(param, 2, 0);
        SSVAL(param, 4, 0);
-       param_len += push_string(iconv_convenience,
+       param_len += push_string(
                        &param[6], fname, PARAM_SIZE,
                        STR_TERMINATE | STR_UNICODE);
 
@@ -510,7 +507,7 @@ static bool scan_nttrans(struct smb_iconv_convenience *iconv_convenience,
        SSVAL(param, 0, level);
        SSVAL(param, 2, 0);
        SSVAL(param, 4, 0);
-       param_len += push_string(iconv_convenience,
+       param_len += push_string(
                        &param[6], "\\newfile.dat", PARAM_SIZE,
                        STR_TERMINATE | STR_UNICODE);
 
@@ -527,8 +524,7 @@ static bool scan_nttrans(struct smb_iconv_convenience *iconv_convenience,
        smbcli_mkdir(cli->tree, "\\testdir");
        param_len = 2;
        SSVAL(param, 0, level);
-       param_len += push_string(iconv_convenience,
-                       &param[2], "\\testdir", PARAM_SIZE,
+       param_len += push_string(&param[2], "\\testdir", PARAM_SIZE,
                        STR_TERMINATE | STR_UNICODE);
 
        status = try_nttrans_len(cli, "dfs", op, level, param, data, param_len,
@@ -558,18 +554,15 @@ bool torture_nttrans_scan(struct torture_context *torture,
        for (op=OP_MIN; op<=OP_MAX; op++) {
                printf("Scanning op=%d\n", op);
                for (level = 0; level <= 50; level++) {
-                       scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
-                                    cli, op, level, fnum, dnum, fname);
+                       scan_nttrans(cli, op, level, fnum, dnum, fname);
                }
 
                for (level = 0x100; level <= 0x130; level++) {
-                       scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
-                                    cli, op, level, fnum, dnum, fname);
+                       scan_nttrans(cli, op, level, fnum, dnum, fname);
                }
 
                for (level = 1000; level < 1050; level++) {
-                       scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
-                                    cli, op, level, fnum, dnum, fname);
+                       scan_nttrans(cli, op, level, fnum, dnum, fname);
                }
        }