r20646: first preparations for cluster enablement. This changes "

  uint32_t server_id
to
  struct server_id server_id;

which allows a server ID to have an node number. The node number will
be zero in non-clustered case. This is the most basic hook needed for
clustering, and ctdb.
(This used to be commit 2365abaa991d57d68c6ebe9be608e01c907102eb)

1 files changed, 12 insertions, 9 deletions

diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h
index 4e775bfe06..1d704ad943 100644
--- a/source4/lib/messaging/irpc.h
+++ b/source4/lib/messaging/irpc.h
@@ -26,7 +26,7 @@
   an incoming irpc message
 */
 struct irpc_message {
-	uint32_t from;
+	struct server_id from;
 	void *private;
 	struct irpc_header header;
 	struct ndr_pull *ndr;
@@ -77,22 +77,25 @@ struct irpc_request {
 };
 
 typedef void (*msg_callback_t)(struct messaging_context *msg, void *private, 
-			       uint32_t msg_type, uint32_t server_id, DATA_BLOB *data);
+			       uint32_t msg_type, 
+			       struct server_id server_id, DATA_BLOB *data);
 
-struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, uint32_t server_id, 
+struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, 
+					 struct server_id server_id, 
 					 struct event_context *ev);
-NTSTATUS messaging_send(struct messaging_context *msg, uint32_t server, 
+NTSTATUS messaging_send(struct messaging_context *msg, struct server_id server, 
 			uint32_t msg_type, DATA_BLOB *data);
 NTSTATUS messaging_register(struct messaging_context *msg, void *private,
 			    uint32_t msg_type, 
 			    msg_callback_t fn);
 NTSTATUS messaging_register_tmp(struct messaging_context *msg, void *private,
 				msg_callback_t fn, uint32_t *msg_type);
-struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, uint32_t server_id, 
+struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, 
+					 struct server_id 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, 
+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);
 
@@ -103,17 +106,17 @@ NTSTATUS irpc_register(struct messaging_context *msg_ctx,
 		       const struct dcerpc_interface_table *table, 
 		       int call, irpc_function_t fn, void *private);
 struct irpc_request *irpc_call_send(struct messaging_context *msg_ctx, 
-				    uint32_t server_id, 
+				    struct server_id server_id, 
 				    const struct dcerpc_interface_table *table, 
 				    int callnum, void *r, TALLOC_CTX *ctx);
 NTSTATUS irpc_call_recv(struct irpc_request *irpc);
 NTSTATUS irpc_call(struct messaging_context *msg_ctx, 
-		   uint32_t server_id, 
+		   struct server_id server_id, 
 		   const struct dcerpc_interface_table *table, 
 		   int callnum, void *r, TALLOC_CTX *ctx);
 
 NTSTATUS irpc_add_name(struct messaging_context *msg_ctx, const char *name);
-uint32_t *irpc_servers_byname(struct messaging_context *msg_ctx, const char *name);
+struct server_id *irpc_servers_byname(struct messaging_context *msg_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);