3 files changed, 36 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1fa3aae8f7..bbce3bdb5c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -648,13 +648,13 @@ typedef int BOOL;
 #include "trans2.h"
 #include "nterr.h"
 #include "ntioctl.h"
-#include "messages.h"
 #include "charset.h"
 #include "dynconfig.h"
 #include "util_getent.h"
 #include "debugparse.h"
 #include "version.h"
 #include "privileges.h"
+#include "messages.h"
 #include "locking.h"
 #include "smb.h"
 #include "ads_cldap.h"
diff --git a/source3/include/messages.h b/source3/include/messages.h
index e3f29832ad..6e4cf13098 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -100,4 +100,37 @@ struct server_id {
 	pid_t pid;
 };
 
+struct messaging_context;
+struct data_blob;
+
+unsigned int messages_pending_for_pid(struct messaging_context *msg_ctx,
+				      struct server_id pid);
+void message_dispatch(struct messaging_context *msg_ctx);
+BOOL message_send_all(struct messaging_context *msg_ctx,
+		      int msg_type,
+		      const void *buf, size_t len,
+		      int *n_sent);
+void message_block(void);
+void message_unblock(void);
+struct event_context *messaging_event_context(struct messaging_context *msg_ctx);
+struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, 
+					 struct server_id server_id, 
+					 struct event_context *ev);
+NTSTATUS messaging_register(struct messaging_context *msg_ctx,
+			    void *private_data,
+			    uint32_t msg_type,
+			    void (*fn)(struct messaging_context *msg,
+				       void *private_data, 
+				       uint32_t msg_type, 
+				       struct server_id server_id,
+				       struct data_blob *data));
+void messaging_deregister(struct messaging_context *ctx, uint32_t msg_type,
+			  void *private_data);
+NTSTATUS messaging_send(struct messaging_context *msg_ctx,
+			struct server_id server, 
+			uint32_t msg_type, const struct data_blob *data);
+NTSTATUS messaging_send_buf(struct messaging_context *msg_ctx,
+			    struct server_id server, uint32_t msg_type,
+			    const uint8 *buf, size_t len);
+
 #endif
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 1a5b43e564..a7d63a6aed 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -425,7 +425,6 @@ struct fd_handle {
 	unsigned long file_id;
 };
 
-struct messaging_context;
 struct event_context;
 struct fd_event;
 struct timed_event;
@@ -532,10 +531,10 @@ typedef struct files_struct {
 #include "sysquotas.h"
 
 /* used to hold an arbitrary blob of data */
-typedef struct data_blob_ {
+typedef struct data_blob {
 	uint8 *data;
 	size_t length;
-	void (*free)(struct data_blob_ *data_blob);
+	void (*free)(struct data_blob *data_blob);
 } DATA_BLOB;
 
 extern const DATA_BLOB data_blob_null;