diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/cluster/cluster.h | 4 | ||||
| -rw-r--r-- | source4/cluster/local.c | 2 | ||||
| -rw-r--r-- | source4/lib/messaging/pymessaging.c | 8 | ||||
| -rw-r--r-- | source4/librpc/idl/server_id4.idl | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index d3ae929a5a..ad2f926596 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -29,12 +29,12 @@ */ #define cluster_id_equal(id_1, id_2) ((id_1)->pid == (id_2)->pid \ && (id_1)->id2 == (id_2)->id2 \ - && (id_1)->node == (id_2)->node) + && (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); diff --git a/source4/cluster/local.c b/source4/cluster/local.c index 17de77f41e..dc9f4f79fb 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -47,7 +47,7 @@ static struct server_id local_id(struct cluster_ops *ops, uint64_t pid, uint32_t static char *local_id_string(struct cluster_ops *ops, TALLOC_CTX *mem_ctx, struct server_id id) { - return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.node, (unsigned long long)id.pid, id.id2); + return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.vnn, (unsigned long long)id.pid, id.id2); } diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index 017b6f91a2..a58176dc07 100644 --- a/source4/lib/messaging/pymessaging.c +++ b/source4/lib/messaging/pymessaging.c @@ -45,7 +45,7 @@ static bool server_id_from_py(PyObject *object, struct server_id *server_id) } if (PyTuple_Size(object) == 3) { - return PyArg_ParseTuple(object, "iii", &server_id->pid, &server_id->id2, &server_id->node); + return PyArg_ParseTuple(object, "iii", &server_id->pid, &server_id->id2, &server_id->vnn); } else { int pid, id2; if (!PyArg_ParseTuple(object, "ii", &pid, &id2)) @@ -158,8 +158,8 @@ static void py_msg_callback_wrapper(struct messaging_context *msg, void *private { PyObject *callback = (PyObject *)private_data; - PyObject_CallFunction(callback, discard_const_p(char, "i(iii)s#"), msg_type, - server_id.pid, server_id.id2, server_id.node, + PyObject_CallFunction(callback, discard_const_p(char, "i(iii)s#"), msg_type, + server_id.pid, server_id.id2, server_id.vnn, data->data, data->length); } @@ -230,7 +230,7 @@ static PyObject *py_messaging_server_id(PyObject *obj, void *closure) struct server_id server_id = messaging_get_server_id(iface->msg_ctx); return Py_BuildValue("(iii)", server_id.pid, server_id.id2, - server_id.node); + server_id.vnn); } static PyGetSetDef py_messaging_getset[] = { diff --git a/source4/librpc/idl/server_id4.idl b/source4/librpc/idl/server_id4.idl index 872d306756..728818f629 100644 --- a/source4/librpc/idl/server_id4.idl +++ b/source4/librpc/idl/server_id4.idl @@ -7,7 +7,7 @@ interface server_id typedef [public] struct { hyper pid; uint32 id2; - uint32 node; + uint32 vnn; udlong unique_id; } server_id; } |