s4:lib/messaging: move messaging prototypes from irpc.h to messaging.h

metze

diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h
index 6607eb42e2cc55a6fe81ba3f76d943ea4695dfc6..95cade12d58a12e9753c787bc3acdde5f6f0697d 100644 (file)
--- a/source4/lib/messaging/irpc.h
+++ b/source4/lib/messaging/irpc.h
@@ -81,33 +81,6 @@ struct irpc_request {
        } async;
 };
 
-struct loadparm_context;
-
-typedef void (*msg_callback_t)(struct messaging_context *msg, void *private_data,
-                              uint32_t msg_type, 
-                              struct server_id server_id, DATA_BLOB *data);
-
-NTSTATUS messaging_send(struct messaging_context *msg, struct server_id server, 
-                       uint32_t msg_type, const DATA_BLOB *data);
-NTSTATUS messaging_register(struct messaging_context *msg, void *private_data,
-                           uint32_t msg_type, 
-                           msg_callback_t fn);
-NTSTATUS messaging_register_tmp(struct messaging_context *msg, void *private_data,
-                               msg_callback_t fn, uint32_t *msg_type);
-struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, 
-                                        const char *dir,
-                                        struct server_id server_id, 
-                                        struct tevent_context *ev);
-struct messaging_context *messaging_client_init(TALLOC_CTX *mem_ctx, 
-                                        const char *dir,
-                                        struct tevent_context *ev);
-NTSTATUS messaging_send_ptr(struct messaging_context *msg, struct server_id server, 
-                           uint32_t msg_type, void *ptr);
-void messaging_deregister(struct messaging_context *msg, uint32_t msg_type, void *private_data);
-
-
-
-
 NTSTATUS irpc_register(struct messaging_context *msg_ctx, 
                       const struct ndr_interface_table *table, 
                       int call, irpc_function_t fn, void *private_data);
@@ -125,7 +98,6 @@ NTSTATUS irpc_add_name(struct messaging_context *msg_ctx, const char *name);
 struct server_id *irpc_servers_byname(struct messaging_context *msg_ctx, TALLOC_CTX *mem_ctx, const char *name);
 void irpc_remove_name(struct messaging_context *msg_ctx, const char *name);
 NTSTATUS irpc_send_reply(struct irpc_message *m, NTSTATUS status);
-struct server_id messaging_get_server_id(struct messaging_context *msg_ctx);
 
 #endif
 

diff --git a/source4/lib/messaging/messaging.h b/source4/lib/messaging/messaging.h
index 08953856a004e11735474e42e27d7d841f0f1e1f..274ba0b86d26859ef08b9b497cc499d02647639d 100644 (file)
--- a/source4/lib/messaging/messaging.h
+++ b/source4/lib/messaging/messaging.h
@@ -22,6 +22,8 @@
 #define _MESSAGES_H_
 
 struct messaging_context;
+struct server_id;
+
 
 /* general messages */
 #define MSG_DEBUG              1
@@ -40,4 +42,27 @@ struct messaging_context;
 /* taskid for messaging of parent process */
 #define SAMBA_PARENT_TASKID     0
 
+typedef void (*msg_callback_t)(struct messaging_context *msg, void *private_data,
+                              uint32_t msg_type,
+                              struct server_id server_id, DATA_BLOB *data);
+
+NTSTATUS messaging_send(struct messaging_context *msg, struct server_id server,
+                       uint32_t msg_type, const DATA_BLOB *data);
+NTSTATUS messaging_register(struct messaging_context *msg, void *private_data,
+                           uint32_t msg_type,
+                           msg_callback_t fn);
+NTSTATUS messaging_register_tmp(struct messaging_context *msg, void *private_data,
+                               msg_callback_t fn, uint32_t *msg_type);
+struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
+                                        const char *dir,
+                                        struct server_id server_id,
+                                        struct tevent_context *ev);
+struct messaging_context *messaging_client_init(TALLOC_CTX *mem_ctx,
+                                        const char *dir,
+                                        struct tevent_context *ev);
+NTSTATUS messaging_send_ptr(struct messaging_context *msg, struct server_id server,
+                           uint32_t msg_type, void *ptr);
+void messaging_deregister(struct messaging_context *msg, uint32_t msg_type, void *private_data);
+struct server_id messaging_get_server_id(struct messaging_context *msg_ctx);
+
 #endif