ctdb-protocol: Add tunnel id prefix for testing

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index af263519c9657178476ffc2ee43a4b6d752a0139..cb807e3b939a9946c96198a1fa6f7289006ae99f 100644 (file)
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -1003,6 +1003,8 @@ struct ctdb_req_keepalive {
        uint32_t uptime;
 };
 
+#define CTDB_TUNNEL_TEST       0xffffffff00000000
+
 #define CTDB_TUNNEL_FLAG_REQUEST       0x00000001
 #define CTDB_TUNNEL_FLAG_REPLY         0x00000002
 #define CTDB_TUNNEL_FLAG_NOREPLY       0x00000010

diff --git a/ctdb/protocol/protocol_debug.c b/ctdb/protocol/protocol_debug.c
index 3dd5c32ab1148c8e2ba53df98caac2ca9bb6b933..4e1566391186b66feacbb8ac3252e7c69c015366 100644 (file)
--- a/ctdb/protocol/protocol_debug.c
+++ b/ctdb/protocol/protocol_debug.c
@@ -356,7 +356,11 @@ static void ctdb_srvid_print(uint64_t srvid, FILE *fp)
 
 static void ctdb_tunnel_id_print(uint64_t tunnel_id, FILE *fp)
 {
-       fprintf(fp, "0x%"PRIx64, tunnel_id);
+       if ((tunnel_id & CTDB_TUNNEL_TEST) == CTDB_TUNNEL_TEST) {
+               fprintf(fp, "TEST-%"PRIx64, tunnel_id);
+       } else {
+               fprintf(fp, "0x%"PRIx64, tunnel_id);
+       }
 }
 
 static void ctdb_tunnel_flags_print(uint32_t flags, FILE *fp)