summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-02-03 22:30:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:43 -0500
commit34aa19cafe8d19412123d92b735e8afda5e0a87d (patch)
tree8d64d4eff223e821266288553189a6a2abb7f33b /source4
parent1d43fa6c9fe05c355119f9a133bd3a4b52ec18c0 (diff)
downloadsamba-34aa19cafe8d19412123d92b735e8afda5e0a87d.tar.gz
samba-34aa19cafe8d19412123d92b735e8afda5e0a87d.tar.bz2
samba-34aa19cafe8d19412123d92b735e8afda5e0a87d.zip
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 (This used to be commit fd974fb64792f8f6c532b01d2a2e012be18eef7e)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/messaging/irpc.h2
-rw-r--r--source4/lib/messaging/messaging.c9
-rw-r--r--source4/libnet/libnet_lookup.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h
index e83e7dce65..5b4abc556f 100644
--- a/source4/lib/messaging/irpc.h
+++ b/source4/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/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index df15928235..6f00ba30ed 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/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/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index 3b2060fdd2..89974203f2 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/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,