add a vnn field to the ctdb_reply_connect_wait pdu so that we can tell

non-ctdb-linked clients what the vnn of the local cluster daemon is

(This used to be ctdb commit 57fd1aa54b234545e1e465b5ace2ce93fcfbc22a)

diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c
index 590397a202671c3df817e0ef694bbbcba9dfd957..6e9fbedb2fad33356241cd60c659aaea6cab6d01 100644 (file)
--- a/ctdb/common/ctdb_daemon.c
+++ b/ctdb/common/ctdb_daemon.c
@@ -129,6 +129,7 @@ static void daemon_request_connect_wait(struct ctdb_client *client,
        r.hdr.ctdb_magic = CTDB_MAGIC;
        r.hdr.ctdb_version = CTDB_VERSION;
        r.hdr.operation = CTDB_REPLY_CONNECT_WAIT;
+       r.vnn           = ctdb_get_vnn(client->ctdb);
        r.num_connected = client->ctdb->num_connected;
        
        res = ctdb_queue_send(client->queue, (uint8_t *)&r.hdr, r.hdr.length);

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index fb6a2584a96466fdaf4187072a3031d07f92777c..bd46f36be44c3b9f09c634dbc9663165d326bb4e 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -289,6 +289,7 @@ struct ctdb_req_connect_wait {
 
 struct ctdb_reply_connect_wait {
        struct ctdb_req_header hdr;
+       uint32_t vnn;
        uint32_t num_connected;
 };