diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
| commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
| tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /source4/cluster/cluster.h | |
| parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
| parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
| download | samba-4.0.0alpha16.tar.gz samba-4.0.0alpha16.tar.xz samba-4.0.0alpha16.zip | |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16samba-4.0.0alpha16
Diffstat (limited to 'source4/cluster/cluster.h')
| -rw-r--r-- | source4/cluster/cluster.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index 6cfcb9b21b3..3dd9f4ce7c5 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -22,30 +22,29 @@ #ifndef __CLUSTER_H__ #define __CLUSTER_H__ -#include "librpc/gen_ndr/server_id4.h" +#include "librpc/gen_ndr/server_id.h" /* test for same cluster id */ -#define cluster_id_equal(id_1, id_2) ((id_1)->id == (id_2)->id \ - && (id_1)->id2 == (id_2)->id2 \ - && (id_1)->node == (id_2)->node) +#define cluster_id_equal(id_1, id_2) ((id_1)->pid == (id_2)->pid \ + && (id_1)->task_id == (id_2)->task_id \ + && (id_1)->vnn == (id_2)->vnn) /* test for same cluster node */ -#define cluster_node_equal(id1, id2) ((id1)->node == (id2)->node) +#define cluster_node_equal(id1, id2) ((id1)->vnn == (id2)->vnn) -struct messaging_context; -typedef void (*cluster_message_fn_t)(struct messaging_context *, DATA_BLOB); +struct imessaging_context; +typedef void (*cluster_message_fn_t)(struct imessaging_context *, DATA_BLOB); /* prototypes */ -struct server_id cluster_id(uint64_t id, uint32_t id2); -const char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id); +struct server_id cluster_id(uint64_t id, uint32_t task_id); struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags); void *cluster_backend_handle(void); -NTSTATUS cluster_message_init(struct messaging_context *msg, struct server_id server, +NTSTATUS cluster_message_init(struct imessaging_context *msg, struct server_id server, cluster_message_fn_t handler); NTSTATUS cluster_message_send(struct server_id server, DATA_BLOB *data); |