ctdb-protocol: Move definition of CTDB_PORT to protocol

Users of CTDB_PORT will all pick up the new definition.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index bec849e857c950f89a81eec002e13bb95a000e53..3120103a48a313e6c0b3e4138784f0e7afb6cc18 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -23,9 +23,6 @@
 #include <sys/socket.h>
 #include "protocol/protocol.h"
 
-/* define ctdb port number */
-#define CTDB_PORT 4379
-
 /* we must align packets to ensure ctdb works on all architectures (eg. sparc) */
 #define CTDB_DS_ALIGNMENT 8
 

diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index 99440b39125287a3c7c6cbd34a88f240bcf5f95d..c775c4bcc64fca0c55378ac09de059e152b46b57 100644 (file)
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -22,6 +22,8 @@
 
 #include <tdb.h>
 
+#define CTDB_PORT 4379
+
 #define CTDB_MAGIC     0x43544442 /* CTDB */
 #define CTDB_PROTOCOL  1
 

diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c
index f3af4bd43f9bd90d28497942a6b0405d21552469..522b5509cb0614831c13613a0fb8fab8443dce47 100644 (file)
--- a/ctdb/tests/src/fake_ctdbd.c
+++ b/ctdb/tests/src/fake_ctdbd.c
@@ -48,8 +48,6 @@
 #include "ipalloc_read_known_ips.h"
 
 
-#define CTDB_PORT 4379
-
 /* A fake flag that is only supported by some functions */
 #define NODE_FLAGS_FAKE_TIMEOUT 0x80000000