Changeset 745 for trunk/server/source3/torture/scanner.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/torture/scanner.c (modified) (10 diffs)

trunk/server/source3/torture/scanner.c

@@ -3 +3 @@
    SMB torture tester - scanning functions
    Copyright (C) Andrew Tridgell 2001
-   
+
    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/>.
@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "torture/proto.h"
+#include "libsmb/libsmb.h"
 
 #define VERBOSE 0
@@ -50 +53 @@
 static NTSTATUS try_trans2(struct cli_state *cli, 
                          int op,
-                         char *param, char *data,
-                         int param_len, int data_len,
-                         unsigned int *rparam_len, unsigned int *rdata_len)
-{
-        uint16 setup = op;
-        char *rparam=NULL, *rdata=NULL;
-
-        if (!cli_send_trans(cli, SMBtrans2, 
-                            NULL,                           /* name */
-                            -1, 0,                          /* fid, flags */
-                            &setup, 1, 0,                   /* setup, length, max */
-                            param, param_len, 2,            /* param, length, max */
-                            data, data_len, cli->max_xmit   /* data, length, max */
-                           )) {
-                return cli_nt_error(cli);
-        }
-
-        cli_receive_trans(cli, SMBtrans2,
-                           &rparam, rparam_len,
-                           &rdata, rdata_len);
-
-        SAFE_FREE(rdata);
-        SAFE_FREE(rparam);
-
-        return cli_nt_error(cli);
+                         uint8_t *param, uint8_t *data,
+                         uint32_t param_len, uint32_t data_len,
+                         uint32_t *rparam_len, uint32_t *rdata_len)
+{
+        uint16_t setup[1];
+        uint8_t *rparam=NULL, *rdata=NULL;
+        NTSTATUS status;
+
+        SSVAL(setup+0, 0, op);
+
+        status = cli_trans(talloc_tos(), cli, SMBtrans2,
+                           NULL, -1, /* name, fid */
+                           op, 0,
+                           NULL, 0, 0, /* setup */
+                           param, param_len, 2,
+                           data, data_len, cli->max_xmit,
+                           NULL,                /* recv_flags2 */
+                           NULL, 0, NULL,       /* rsetup */
+                           &rparam, 0, rparam_len,
+                           &rdata, 0, rdata_len);
+
+        TALLOC_FREE(rdata);
+        TALLOC_FREE(rparam);
+
+        return status;
 }
 
@@ -81 +84 @@
                              const char *format,
                              int op, int level,
-                             char *param, char *data,
-                             int param_len, int *data_len,
-                             unsigned int *rparam_len, unsigned int *rdata_len)
+                             uint8_t *param, uint8_t *data,
+                             uint32_t param_len, uint32_t *data_len,
+                             uint32_t *rparam_len, uint32_t *rdata_len)
 {
         NTSTATUS ret=NT_STATUS_OK;
@@ -116 +119 @@
                         int fnum, int dnum, const char *fname)
 {
-        int data_len = 0;
-        int param_len = 0;
-        unsigned int rparam_len, rdata_len;
-        char param[PARAM_SIZE], data[DATA_SIZE];
+        uint32_t data_len = 0;
+        uint32_t param_len = 0;
+        uint32_t rparam_len, rdata_len;
+        uint8_t param[PARAM_SIZE], data[DATA_SIZE];
         NTSTATUS status;
 
@@ -171 +174 @@
         status = try_trans2_len(cli, "newfile", op, level, param, data, param_len, &data_len, 
                                 &rparam_len, &rdata_len);
-        cli_unlink(cli, "\\newfile.dat", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\newfile.dat", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\newfile.dat");
         if (NT_STATUS_IS_OK(status)) return True;
@@ -259 +262 @@
 ****************************************************************************/
 static NTSTATUS try_nttrans(struct cli_state *cli, 
-                         int op,
-                         char *param, char *data,
-                         int param_len, int data_len,
-                         unsigned int *rparam_len, unsigned int *rdata_len)
-{
-        char *rparam=NULL, *rdata=NULL;
-
-        if (!cli_send_nt_trans(cli, op, 
-                               0,   
-                               NULL, 0, 0,
-                               param, param_len, 2,            /* param, length, max */
-                               data, data_len, cli->max_xmit   /* data, length, max */
-                           )) {
-                return cli_nt_error(cli);
-        }
-
-        cli_receive_nt_trans(cli,
-                             &rparam, rparam_len,
-                             &rdata, rdata_len);
-
+                            int op,
+                            uint8_t *param, uint8_t *data,
+                            int32_t param_len, uint32_t data_len,
+                            uint32_t *rparam_len,
+                            uint32_t *rdata_len)
+{
+        uint8_t *rparam=NULL, *rdata=NULL;
+        NTSTATUS status;
+
+        status = cli_trans(talloc_tos(), cli, SMBnttrans,
+                           NULL, -1, /* name, fid */
+                           op, 0,
+                           NULL, 0, 0, /* setup */
+                           param, param_len, 2,
+                           data, data_len, cli->max_xmit,
+                           NULL,                /* recv_flags2 */
+                           NULL, 0, NULL,       /* rsetup */
+                           &rparam, 0, rparam_len,
+                           &rdata, 0, rdata_len);
         SAFE_FREE(rdata);
         SAFE_FREE(rparam);
 
-        return cli_nt_error(cli);
+        return status;
 }
 
@@ -289 +291 @@
                              const char *format,
                              int op, int level,
-                             char *param, char *data,
-                             int param_len, int *data_len,
-                             unsigned int *rparam_len, unsigned int *rdata_len)
+                             uint8_t *param, uint8_t *data,
+                             int param_len, uint32_t *data_len,
+                             uint32_t *rparam_len, uint32_t *rdata_len)
 {
         NTSTATUS ret=NT_STATUS_OK;
@@ -324 +326 @@
                         int fnum, int dnum, const char *fname)
 {
-        int data_len = 0;
-        int param_len = 0;
-        unsigned int rparam_len, rdata_len;
-        char param[PARAM_SIZE], data[DATA_SIZE];
+        uint32_t data_len = 0;
+        uint32_t param_len = 0;
+        uint32_t rparam_len, rdata_len;
+        uint8_t param[PARAM_SIZE], data[DATA_SIZE];
         NTSTATUS status;
 
@@ -379 +381 @@
         status = try_nttrans_len(cli, "newfile", op, level, param, data, param_len, &data_len, 
                                 &rparam_len, &rdata_len);
-        cli_unlink(cli, "\\newfile.dat", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\newfile.dat", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\newfile.dat");
         if (NT_STATUS_IS_OK(status)) return True;