Changeset 745 for trunk/server/source3/rpcclient/cmd_echo.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/rpcclient/cmd_echo.c (modified) (13 diffs)

trunk/server/source3/rpcclient/cmd_echo.c

@@ -21 +21 @@
 #include "includes.h"
 #include "rpcclient.h"
-#include "../librpc/gen_ndr/cli_echo.h"
+#include "../librpc/gen_ndr/ndr_echo_c.h"
 
 static NTSTATUS cmd_echo_add_one(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                                  int argc, const char **argv)
 {
+        struct dcerpc_binding_handle *b = cli->binding_handle;
         uint32 request = 1, response;
-        NTSTATUS result;
+        NTSTATUS status;
 
         if (argc > 2) {
@@ -34 +35 @@
         }
 
-        if (argc == 2)
+        if (argc == 2) {
                 request = atoi(argv[1]);
+        }
 
-        result = rpccli_echo_AddOne(cli, mem_ctx, request, &response);
-
-        if (!NT_STATUS_IS_OK(result))
+        status = dcerpc_echo_AddOne(b, mem_ctx, request, &response);
+        if (!NT_STATUS_IS_OK(status)) {
                 goto done;
+        }
 
         printf("%d + 1 = %d\n", request, response);
 
 done:
-        return result;
+        return status;
 }
 
@@ -51 +53 @@
                               int argc, const char **argv)
 {
+        struct dcerpc_binding_handle *b = cli->binding_handle;
         uint32 size, i;
-        NTSTATUS result;
+        NTSTATUS status;
         uint8_t *in_data = NULL, *out_data = NULL;
 
@@ -64 +67 @@
                 printf("Failure to allocate buff of %d bytes\n",
                        size);
-                result = NT_STATUS_NO_MEMORY;
+                status = NT_STATUS_NO_MEMORY;
                 goto done;
         }
@@ -70 +73 @@
                 printf("Failure to allocate buff of %d bytes\n",
                        size);
-                result = NT_STATUS_NO_MEMORY;
+                status = NT_STATUS_NO_MEMORY;
                 goto done;
         }
 
-        for (i = 0; i < size; i++)
+        for (i = 0; i < size; i++) {
                 in_data[i] = i & 0xff;
+        }
 
-        result = rpccli_echo_EchoData(cli, mem_ctx, size, in_data, out_data);
-
-        if (!NT_STATUS_IS_OK(result))
+        status = dcerpc_echo_EchoData(b, mem_ctx, size, in_data, out_data);
+        if (!NT_STATUS_IS_OK(status)) {
                 goto done;
+        }
 
         for (i = 0; i < size; i++) {
@@ -86 +90 @@
                         printf("mismatch at offset %d, %d != %d\n",
                                i, in_data[i], out_data[i]);
-                        result = NT_STATUS_UNSUCCESSFUL;
+                        status = NT_STATUS_UNSUCCESSFUL;
                 }
         }
@@ -94 +98 @@
         SAFE_FREE(out_data);
 
-        return result;
+        return status;
 }
 
@@ -101 +105 @@
                                      const char **argv)
 {
+        struct dcerpc_binding_handle *b = cli->binding_handle;
         uint32 size, i;
-        NTSTATUS result;
+        NTSTATUS status;
         uint8_t *out_data = NULL;
 
@@ -114 +119 @@
                 printf("Failure to allocate buff of %d bytes\n",
                        size);
-                result = NT_STATUS_NO_MEMORY;
+                status = NT_STATUS_NO_MEMORY;
                 goto done;              
         }
         
 
-        result = rpccli_echo_SourceData(cli, mem_ctx, size, out_data);
-
-        if (!NT_STATUS_IS_OK(result))
+        status = dcerpc_echo_SourceData(b, mem_ctx, size, out_data);
+        if (!NT_STATUS_IS_OK(status)) {
                 goto done;
+        }
 
         for (i = 0; i < size; i++) {
@@ -128 +133 @@
                         printf("mismatch at offset %d, %d != %d\n",
                                i, out_data[i], i & 0xff);
-                        result = NT_STATUS_UNSUCCESSFUL;
+                        status = NT_STATUS_UNSUCCESSFUL;
                 }
         }
@@ -135 +140 @@
 
         SAFE_FREE(out_data);
-        return result;
+        return status;
 }
 
@@ -141 +146 @@
                                    int argc, const char **argv)
 {
+        struct dcerpc_binding_handle *b = cli->binding_handle;
         uint32 size, i;
-        NTSTATUS result;
+        NTSTATUS status;
         uint8_t *in_data = NULL;
 
@@ -154 +160 @@
                 printf("Failure to allocate buff of %d bytes\n",
                        size);
-                result = NT_STATUS_NO_MEMORY;
+                status = NT_STATUS_NO_MEMORY;
                 goto done;              
         }
 
-        for (i = 0; i < size; i++)
+        for (i = 0; i < size; i++) {
                 in_data[i] = i & 0xff;
+        }
 
-        result = rpccli_echo_SinkData(cli, mem_ctx, size, in_data);
-
-        if (!NT_STATUS_IS_OK(result))
+        status = dcerpc_echo_SinkData(b, mem_ctx, size, in_data);
+        if (!NT_STATUS_IS_OK(status)) {
                 goto done;
+        }
 
 done:
         SAFE_FREE(in_data);
 
-        return result;
+        return status;
 }