Changeset 745 for trunk/server/source4/lib/messaging/tests

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)
• source4/lib/messaging/tests/bindings.py (deleted)
• source4/lib/messaging/tests/irpc.c (modified) (11 diffs)
• source4/lib/messaging/tests/messaging.c (modified) (3 diffs)

trunk/server/source4/lib/messaging/tests/irpc.c

@@ -24 +24 @@
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_echo.h"
+#include "librpc/gen_ndr/ndr_echo_c.h"
 #include "torture/torture.h"
 #include "cluster/cluster.h"
@@ -58 +59 @@
 {
         struct irpc_message *irpc = talloc_get_type(private_data, struct irpc_message);
-        struct echo_EchoData *r = irpc->data;
-        r->out.out_data = talloc_memdup(r, r->in.in_data, r->in.len);
+        struct echo_EchoData *r = (struct echo_EchoData *)irpc->data;
+        r->out.out_data = (uint8_t *)talloc_memdup(r, r->in.in_data, r->in.len);
         if (r->out.out_data == NULL) {
                 irpc_send_reply(irpc, NT_STATUS_NO_MEMORY);
@@ -89 +90 @@
         const struct irpc_test_data *data = (const struct irpc_test_data *)_data;
         uint32_t value = *(const uint32_t *)_value;
+        struct dcerpc_binding_handle *irpc_handle;
+
+        irpc_handle = irpc_binding_handle(test, data->msg_ctx1,
+                                          cluster_id(0, MSG_ID2),
+                                          &ndr_table_rpcecho);
+        torture_assert(test, irpc_handle, "no memory");
 
         /* make the call */
@@ -94 +101 @@
 
         test_debug = true;
-        status = IRPC_CALL(data->msg_ctx1, cluster_id(0, MSG_ID2), 
-                           rpcecho, ECHO_ADDONE, &r, test);
+        status = dcerpc_echo_AddOne_r(irpc_handle, test, &r);
         test_debug = false;
         torture_assert_ntstatus_ok(test, status, "AddOne failed");
@@ -118 +124 @@
         const struct irpc_test_data *data = (const struct irpc_test_data *)tcase_data;
         TALLOC_CTX *mem_ctx = tctx;
+        struct dcerpc_binding_handle *irpc_handle;
+
+        irpc_handle = irpc_binding_handle(mem_ctx, data->msg_ctx1,
+                                          cluster_id(0, MSG_ID2),
+                                          &ndr_table_rpcecho);
+        torture_assert(tctx, irpc_handle, "no memory");
 
         /* make the call */
@@ -123 +135 @@
         r.in.len = strlen((char *)r.in.in_data);
 
-        status = IRPC_CALL(data->msg_ctx1, cluster_id(0, MSG_ID2), 
-                           rpcecho, ECHO_ECHODATA, &r, 
-                           mem_ctx);
+        status = dcerpc_echo_EchoData_r(irpc_handle, mem_ctx, &r);
         torture_assert_ntstatus_ok(tctx, status, "EchoData failed");
 
@@ -142 +152 @@
 }
 
-
-static void irpc_callback(struct irpc_request *irpc)
-{
-        struct echo_AddOne *r = (struct echo_AddOne *)irpc->r;
-        int *pong_count = (int *)irpc->async.private_data;
-        NTSTATUS status = irpc_call_recv(irpc);
+struct irpc_callback_state {
+        struct echo_AddOne r;
+        int *pong_count;
+};
+
+static void irpc_callback(struct tevent_req *subreq)
+{
+        struct irpc_callback_state *s =
+                tevent_req_callback_data(subreq,
+                struct irpc_callback_state);
+        NTSTATUS status;
+
+        status = dcerpc_echo_AddOne_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!NT_STATUS_IS_OK(status)) {
                 printf("irpc call failed - %s\n", nt_errstr(status));
         }
-        if (*r->out.out_data != r->in.in_data + 1) {
+        if (*s->r.out.out_data != s->r.in.in_data + 1) {
                 printf("AddOne wrong answer - %u + 1 = %u should be %u\n", 
-                       r->in.in_data, *r->out.out_data, r->in.in_data+1);
-        }
-        (*pong_count)++;
+                       s->r.in.in_data, *s->r.out.out_data, s->r.in.in_data+1);
+        }
+        (*s->pong_count)++;
 }
 
@@ -169 +187 @@
         const struct irpc_test_data *data = (const struct irpc_test_data *)tcase_data;
         struct timeval tv;
-        struct echo_AddOne r;
         TALLOC_CTX *mem_ctx = tctx;
         int timelimit = torture_setting_int(tctx, "timelimit", 10);
+        struct dcerpc_binding_handle *irpc_handle;
+
+        irpc_handle = irpc_binding_handle(mem_ctx, data->msg_ctx1,
+                                          cluster_id(0, MSG_ID2),
+                                          &ndr_table_rpcecho);
+        torture_assert(tctx, irpc_handle, "no memory");
 
         tv = timeval_current();
-
-        r.in.in_data = 0;
 
         torture_comment(tctx, "Sending echo for %d seconds\n", timelimit);
         while (timeval_elapsed(&tv) < timelimit) {
-                struct irpc_request *irpc;
-
-                irpc = IRPC_CALL_SEND(data->msg_ctx1, cluster_id(0, MSG_ID2), 
-                                      rpcecho, ECHO_ADDONE, 
-                                      &r, mem_ctx);
-                torture_assert(tctx, irpc != NULL, "AddOne send failed");
-
-                irpc->async.fn = irpc_callback;
-                irpc->async.private_data = &pong_count;
+                struct tevent_req *subreq;
+                struct irpc_callback_state *s;
+
+                s = talloc_zero(mem_ctx, struct irpc_callback_state);
+                torture_assert(tctx, s != NULL, "no mem");
+
+                s->pong_count = &pong_count;
+
+                subreq = dcerpc_echo_AddOne_r_send(mem_ctx,
+                                                   tctx->ev,
+                                                   irpc_handle,
+                                                   &s->r);
+                torture_assert(tctx, subreq != NULL, "AddOne send failed");
+
+                tevent_req_set_callback(subreq, irpc_callback, s);
 
                 ping_count++;
@@ -216 +243 @@
         *_data = data = talloc(tctx, struct irpc_test_data);
 
-        lp_set_cmdline(tctx->lp_ctx, "pid directory", "piddir.tmp");
+        lpcfg_set_cmdline(tctx->lp_ctx, "pid directory", "piddir.tmp");
 
         data->ev = tctx->ev;
         torture_assert(tctx, data->msg_ctx1 = 
                        messaging_init(tctx, 
-                                      lp_messaging_path(tctx, tctx->lp_ctx), 
+                                      lpcfg_messaging_path(tctx, tctx->lp_ctx),
                                       cluster_id(0, MSG_ID1),
-                                      lp_iconv_convenience(tctx->lp_ctx),
                                       data->ev),
                        "Failed to init first messaging context");
@@ -229 +255 @@
         torture_assert(tctx, data->msg_ctx2 = 
                        messaging_init(tctx, 
-                                      lp_messaging_path(tctx, tctx->lp_ctx),
+                                      lpcfg_messaging_path(tctx, tctx->lp_ctx),
                                       cluster_id(0, MSG_ID2), 
-                                      lp_iconv_convenience(tctx->lp_ctx),
                                       data->ev),
                        "Failed to init second messaging context");
@@ -247 +272 @@
 struct torture_suite *torture_local_irpc(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "IRPC");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "irpc");
         struct torture_tcase *tcase = torture_suite_add_tcase(suite, "irpc");
         int i;

trunk/server/source4/lib/messaging/tests/messaging.c

@@ -68 +68 @@
         uint32_t msg_ping, msg_exit;
 
-        lp_set_cmdline(tctx->lp_ctx, "pid directory", "piddir.tmp");
+        lpcfg_set_cmdline(tctx->lp_ctx, "pid directory", "piddir.tmp");
 
         ev = tctx->ev;
 
         msg_server_ctx = messaging_init(tctx, 
-                                        lp_messaging_path(tctx, tctx->lp_ctx), 
-                                        cluster_id(0, 1), 
-                                        lp_iconv_convenience(tctx->lp_ctx),
+                                        lpcfg_messaging_path(tctx, tctx->lp_ctx), cluster_id(0, 1),
                                         ev);
         
@@ -84 +82 @@
 
         msg_client_ctx = messaging_init(tctx, 
-                                        lp_messaging_path(tctx, tctx->lp_ctx), 
+                                        lpcfg_messaging_path(tctx, tctx->lp_ctx),
                                         cluster_id(0, 2), 
-                                        lp_iconv_convenience(tctx->lp_ctx),
                                         ev);
 
@@ -140 +137 @@
 struct torture_suite *torture_local_messaging(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *s = torture_suite_create(mem_ctx, "MESSAGING");
+        struct torture_suite *s = torture_suite_create(mem_ctx, "messaging");
         torture_suite_add_simple_test(s, "ping_speed", test_ping_speed);
         return s;