Changeset 745 for trunk/server/pidl/tests/samba3-cli.pl

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)
• pidl/tests/samba3-cli.pl (modified) (12 diffs)

trunk/server/pidl/tests/samba3-cli.pl

@@ -5 +5 @@
 use warnings;
 
-use Test::More tests => 9;
+use Test::More tests => 8;
 use FindBin qw($RealBin);
 use lib "$RealBin";
 use Util;
 use Parse::Pidl::Util qw(MyDumper);
-use Parse::Pidl::Samba3::ClientNDR qw(ParseFunction ParseOutputArgument);
+use Parse::Pidl::Samba3::ClientNDR qw(ParseFunction);
 use Parse::Pidl::Samba4::Header qw(GenerateFunctionInEnv GenerateFunctionOutEnv);
 
@@ -32 +32 @@
 is($x->{res}, 
 "struct rpccli_bar_state {
-        struct bar orig;
-        struct bar tmp;
         TALLOC_CTX *out_mem_ctx;
-        NTSTATUS (*dispatch_recv)(struct tevent_req *req, TALLOC_CTX *mem_ctx);
 };
 
@@ -54 +51 @@
         }
         state->out_mem_ctx = NULL;
-        state->dispatch_recv = cli->dispatch_recv;
-
-        /* In parameters */
-
-        /* Out parameters */
-
-        if (DEBUGLEVEL >= 10) {
-                NDR_PRINT_IN_DEBUG(bar, &state->orig);
-        }
-
-        /* make a temporary copy, that we pass to the dispatch function */
-        state->tmp = state->orig;
-
-        subreq = cli->dispatch_send(state, ev, cli,
-                                    &ndr_table_foo,
-                                    NDR_BAR,
-                                    &state->tmp);
+
+        subreq = dcerpc_bar_send(state,
+                                 ev,
+                                 cli->binding_handle);
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, ev);
@@ -93 +77 @@
         }
 
-        status = state->dispatch_recv(subreq, mem_ctx);
+        status = dcerpc_bar_recv(subreq,
+                                 mem_ctx);
         TALLOC_FREE(subreq);
         if (!NT_STATUS_IS_OK(status)) {
@@ -100 +85 @@
         }
 
-        /* Copy out parameters */
-
-        /* Reset temporary structure */
-        ZERO_STRUCT(state->tmp);
-
-        if (DEBUGLEVEL >= 10) {
-                NDR_PRINT_OUT_DEBUG(bar, &state->orig);
-        }
-
         tevent_req_done(req);
 }
@@ -124 +100 @@
         }
 
-        /* Steal possbile out parameters to the callers context */
+        /* Steal possible out parameters to the callers context */
         talloc_steal(mem_ctx, state->out_mem_ctx);
 
@@ -134 +110 @@
                     TALLOC_CTX *mem_ctx)
 {
-\tstruct bar r;
-\tNTSTATUS status;
-
-\t/* In parameters */
-
-\tif (DEBUGLEVEL >= 10) {
-\t\tNDR_PRINT_IN_DEBUG(bar, &r);
-\t}
-
-        status = cli->dispatch(cli,
-                                mem_ctx,
-                                &ndr_table_foo,
-                                NDR_BAR,
-                                &r);
-
-\tif (!NT_STATUS_IS_OK(status)) {
-\t\treturn status;
-\t}
-
-\tif (DEBUGLEVEL >= 10) {
-\t\tNDR_PRINT_OUT_DEBUG(bar, &r);
-\t}
-
-\tif (NT_STATUS_IS_ERR(status)) {
-\t\treturn status;
-\t}
-
-\t/* Return variables */
-
-\t/* Return result */
-\treturn NT_STATUS_OK;
+        NTSTATUS status;
+
+        status = dcerpc_bar(cli->binding_handle,
+                            mem_ctx);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        /* Return result */
+        return NT_STATUS_OK;
 }
 
@@ -175 +130 @@
 is($x->{res}, 
 "struct rpccli_bar_state {
-        struct bar orig;
-        struct bar tmp;
         TALLOC_CTX *out_mem_ctx;
-        NTSTATUS (*dispatch_recv)(struct tevent_req *req, TALLOC_CTX *mem_ctx);
+        WERROR result;
 };
 
@@ -197 +150 @@
         }
         state->out_mem_ctx = NULL;
-        state->dispatch_recv = cli->dispatch_recv;
-
-        /* In parameters */
-
-        /* Out parameters */
-
-        /* Result */
-        ZERO_STRUCT(state->orig.out.result);
-
-        if (DEBUGLEVEL >= 10) {
-                NDR_PRINT_IN_DEBUG(bar, &state->orig);
-        }
-
-        /* make a temporary copy, that we pass to the dispatch function */
-        state->tmp = state->orig;
-
-        subreq = cli->dispatch_send(state, ev, cli,
-                                    &ndr_table_foo,
-                                    NDR_BAR,
-                                    &state->tmp);
+
+        subreq = dcerpc_bar_send(state,
+                                 ev,
+                                 cli->binding_handle);
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, ev);
@@ -239 +176 @@
         }
 
-        status = state->dispatch_recv(subreq, mem_ctx);
+        status = dcerpc_bar_recv(subreq,
+                                 mem_ctx,
+                                 &state->result);
         TALLOC_FREE(subreq);
         if (!NT_STATUS_IS_OK(status)) {
                 tevent_req_nterror(req, status);
                 return;
-        }
-
-        /* Copy out parameters */
-
-        /* Copy result */
-        state->orig.out.result = state->tmp.out.result;
-
-        /* Reset temporary structure */
-        ZERO_STRUCT(state->tmp);
-
-        if (DEBUGLEVEL >= 10) {
-                NDR_PRINT_OUT_DEBUG(bar, &state->orig);
         }
 
@@ -274 +201 @@
         }
 
-        /* Steal possbile out parameters to the callers context */
+        /* Steal possible out parameters to the callers context */
         talloc_steal(mem_ctx, state->out_mem_ctx);
 
         /* Return result */
-        *result = state->orig.out.result;
+        *result = state->result;
 
         tevent_req_received(req);
@@ -288 +215 @@
                     WERROR *werror)
 {
-\tstruct bar r;
-\tNTSTATUS status;
-
-\t/* In parameters */
-
-\tif (DEBUGLEVEL >= 10) {
-\t\tNDR_PRINT_IN_DEBUG(bar, &r);
-\t}
-
-        status = cli->dispatch(cli,
-                                mem_ctx,
-                                &ndr_table_foo,
-                                NDR_BAR,
-                                &r);
-
-\tif (!NT_STATUS_IS_OK(status)) {
-\t\treturn status;
-\t}
-
-\tif (DEBUGLEVEL >= 10) {
-\t\tNDR_PRINT_OUT_DEBUG(bar, &r);
-\t}
-
-\tif (NT_STATUS_IS_ERR(status)) {
-\t\treturn status;
-\t}
-
-\t/* Return variables */
-
-\t/* Return result */
-\tif (werror) {
-\t\t*werror = r.out.result;
-\t}
-
-\treturn werror_to_ntstatus(r.out.result);
+        WERROR result;
+        NTSTATUS status;
+
+        status = dcerpc_bar(cli->binding_handle,
+                            mem_ctx,
+                            &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        /* Return result */
+        if (werror) {
+                *werror = result;
+        }
+
+        return werror_to_ntstatus(result);
 }
 
 ");
 
-$x = new Parse::Pidl::Samba3::ClientNDR();
-
-$fn = { NAME => "bar", ELEMENTS => [ ], RETURN_TYPE => "WERROR" };
-my $e = { NAME => "foo", ORIGINAL => { FILE => "f", LINE => -1 },
-          LEVELS => [ { TYPE => "ARRAY", SIZE_IS => "mysize" }, { TYPE => "DATA", DATA_TYPE => "int" } ]};
-
-$x->ParseOutputArgument($fn, $e);
-is($x->{res}, "memcpy(foo, r.out.foo, (mysize) * sizeof(*foo));\n");