r13317: Create a new function messaging_client_init() which can be used when

we don't have a server messaging context.  We should replace the
datagram messages with stream sockets in this case, so we don't have
to create a unique socket.

Andrew Bartlett

diff --git a/source/lib/messaging/irpc.h b/source/lib/messaging/irpc.h
index e83e7dce651c69029b08d50cfb6d3ebeab622820..5b4abc556fc00e168b08b6b5671f21757edd6afb 100644 (file)
--- a/source/lib/messaging/irpc.h
+++ b/source/lib/messaging/irpc.h
@@ -86,6 +86,8 @@ void messaging_register(struct messaging_context *msg, void *private,
                        void (*fn)(struct messaging_context *, void *, uint32_t, uint32_t, DATA_BLOB *));
 struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, uint32_t server_id, 
                                         struct event_context *ev);
+struct messaging_context *messaging_client_init(TALLOC_CTX *mem_ctx, 
+                                        struct event_context *ev);
 NTSTATUS messaging_send_ptr(struct messaging_context *msg, uint32_t server, 
                            uint32_t msg_type, void *ptr);
 void messaging_deregister(struct messaging_context *msg, uint32_t msg_type, void *private);

diff --git a/source/lib/messaging/messaging.c b/source/lib/messaging/messaging.c
index df15928235b23bbbcf8771b21da24689541b9ca3..6f00ba30edeaabf4ef8fff4b81cd32954da21d1d 100644 (file)
--- a/source/lib/messaging/messaging.c
+++ b/source/lib/messaging/messaging.c
@@ -459,7 +459,14 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, uint32_t server_id
        return msg;
 }
 
-
+/* 
+   A hack, for the short term until we get 'client only' messaging in place 
+*/
+struct messaging_context *messaging_client_init(TALLOC_CTX *mem_ctx, 
+                                               struct event_context *ev)
+{
+       return messaging_init(mem_ctx, random() % 0x10000000, ev);
+}
 /*
   a list of registered irpc server functions
 */

diff --git a/source/libnet/libnet_lookup.c b/source/libnet/libnet_lookup.c
index 3b2060fdd2812650181c05f8c19b0fb26fb76282..89974203f2af0da83d8f259d20a3b33333e6a6f1 100644 (file)
--- a/source/libnet/libnet_lookup.c
+++ b/source/libnet/libnet_lookup.c
@@ -167,7 +167,7 @@ struct composite_context* libnet_LookupDCs_send(struct libnet_context *ctx,
                                                TALLOC_CTX *mem_ctx,
                                                struct libnet_LookupDCs *io)
 {
-       struct messaging_context *msg_ctx = messaging_init(mem_ctx, random() % 0x10000000, ctx->event_ctx);
+       struct messaging_context *msg_ctx = messaging_client_init(mem_ctx, ctx->event_ctx);
        struct composite_context *c;
        c = finddcs_send(mem_ctx,
                         io->in.domain_name,