ctdb-daemon: Rename struct ctdb_control_transdb to ctdb_transdb

[obnox/samba/samba-obnox.git] / ctdb / include / ctdb_protocol.h

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index c9f0a9d86a1e367a4eb4de1a801095529c523b0b..a850e5c6850dba9eff7525aa1fe09172ed2404ba 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -767,35 +767,38 @@ struct ctdb_notify_data_old {
 
 /* table that contains a list of all dbids on a node
  */
-struct ctdb_dbid_map {
-       uint32_t num;
-       struct ctdb_dbid {
-               uint32_t dbid;
+
+struct ctdb_dbid {
+       uint32_t db_id;
 #define CTDB_DB_FLAGS_PERSISTENT       0x01
 #define CTDB_DB_FLAGS_READONLY         0x02
 #define CTDB_DB_FLAGS_STICKY           0x04
-               uint8_t flags;
-       } dbs[1];
+       uint8_t flags;
+};
+
+struct ctdb_dbid_map_old {
+       uint32_t num;
+       struct ctdb_dbid dbs[1];
 };
 
 #define CTDB_RECOVERY_NORMAL           0
 #define CTDB_RECOVERY_ACTIVE           1
 
-enum ctdb_server_id_type {
+enum ctdb_client_id_type {
        SERVER_TYPE_SAMBA=1,
        SERVER_TYPE_NFSD=2,
        SERVER_TYPE_ISCSID=3
 };
 
-struct ctdb_server_id {
-       enum ctdb_server_id_type type;
+struct ctdb_client_id {
+       enum ctdb_client_id_type type;
        uint32_t pnn;
        uint32_t server_id;
 };
 
-struct ctdb_server_id_list {
+struct ctdb_client_id_list_old {
        uint32_t num;
-       struct ctdb_server_id server_ids[1];
+       struct ctdb_client_id server_ids[1];
 };
 
 struct ctdb_uptime {
@@ -805,12 +808,12 @@ struct ctdb_uptime {
        struct timeval last_recovery_finished;
 };
 
-struct ctdb_control_tcp_addr {
+struct ctdb_connection {
        ctdb_sock_addr src;
-       ctdb_sock_addr dest;
+       ctdb_sock_addr dst;
 };
 
-struct ctdb_ban_time {
+struct ctdb_ban_state {
        uint32_t pnn;
        uint32_t time;
 };
@@ -823,40 +826,26 @@ struct ctdb_db_priority {
 /*
  * Structures to support SRVID requests and replies
  */
-struct srvid_request {
+struct ctdb_srvid_message {
        uint32_t pnn;
        uint64_t srvid;
 };
 
-struct srvid_request_data {
+struct ctdb_disable_message {
        uint32_t pnn;
        uint64_t srvid;
-       uint32_t data;
-};
-
-/*
-  a tcp connection description
-  also used by tcp_add and tcp_remove controls
- */
-struct ctdb_tcp_connection {
-       ctdb_sock_addr src_addr;
-       ctdb_sock_addr dst_addr;
-};
-
-/* the wire representation for a tcp tickle array */
-struct ctdb_tcp_wire_array {
-       uint32_t num;
-       struct ctdb_tcp_connection connections[1];
+       uint32_t timeout;
 };
 
 /* the list of tcp tickles used by get/set tcp tickle list */
-struct ctdb_control_tcp_tickle_list {
+struct ctdb_tickle_list_old {
        ctdb_sock_addr addr;
-       struct ctdb_tcp_wire_array tickles;
+       uint32_t num;
+       struct ctdb_connection connections[1];
 };
 
 /* all tunable variables go in here */
-struct ctdb_tunable {
+struct ctdb_tunable_list {
        uint32_t max_redirect_count;
        uint32_t seqnum_interval; /* unit is ms */
        uint32_t control_timeout;
@@ -932,20 +921,9 @@ enum ctdb_runstate {
 
 /*
   struct holding a ctdb_sock_addr and an interface name,
-  used to add/remove public addresses
- */
-struct ctdb_control_ip_iface {
-       ctdb_sock_addr addr;
-       uint32_t mask;
-       uint32_t len;
-       char iface[1];
-};
-
-/*
-  struct holding a ctdb_sock_addr and an interface name,
-  used for send_gratious_arp
+  used to add/remove public addresses and grat arp
  */
-struct ctdb_control_gratious_arp {
+struct ctdb_addr_info_old {
        ctdb_sock_addr addr;
        uint32_t mask;
        uint32_t len;
@@ -964,7 +942,7 @@ struct ctdb_node_flag_change {
 #define CTDB_LMASTER_ANY       0xffffffff
 
 /* structure used for pulldb control */
-struct ctdb_control_pulldb {
+struct ctdb_pulldb {
        uint32_t db_id;
        uint32_t lmaster;
 };
@@ -979,7 +957,7 @@ struct ctdb_marshall_buffer {
 /*
   structure for setting a tunable
  */
-struct ctdb_control_set_tunable {
+struct ctdb_tunable_old {
        uint32_t value;
        uint32_t length;
        uint8_t  name[1];
@@ -1003,9 +981,9 @@ struct ctdb_control_list_tunable {
 };
 
 
-struct ctdb_control_transdb {
+struct ctdb_transdb {
        uint32_t db_id;
-       uint32_t transaction_id;
+       uint32_t tid;
 };
 
 #define CTDB_PUBLIC_IP_FLAGS_ONLY_AVAILABLE 0x00010000