Implement a new function GETNODEMAP in libctdb.

[metze/ctdb/wip.git] / include / ctdb_client.h

diff --git a/include/ctdb_client.h b/include/ctdb_client.h
index 4bb14e960ee9aa6f3ce74d75bdc4cf0b32726fd6..16ed9c05f75ae8dd0c1a7f892c7a68cc103132ff 100644 (file)
--- a/include/ctdb_client.h
+++ b/include/ctdb_client.h
@@ -52,12 +52,12 @@ struct ctdb_client_notify_deregister {
        uint64_t srvid;
 };
 
-struct event_context;
+struct tevent_context;
 
 /*
   initialise ctdb subsystem
 */
-struct ctdb_context *ctdb_init(struct event_context *ev);
+struct ctdb_context *ctdb_init(struct tevent_context *ev);
 
 /*
   choose the transport
@@ -87,6 +87,7 @@ void ctdb_set_max_lacount(struct ctdb_context *ctdb, unsigned count);
 int ctdb_set_address(struct ctdb_context *ctdb, const char *address);
 
 int ctdb_set_socketname(struct ctdb_context *ctdb, const char *socketname);
+const char *ctdb_get_socketname(struct ctdb_context *ctdb);
 
 /*
   tell ctdb what nodes are available. This takes a filename, which will contain
@@ -192,7 +193,7 @@ int ctdb_register_message_handler(struct ctdb_context *ctdb,
 struct ctdb_db_context *find_ctdb_db(struct ctdb_context *ctdb, uint32_t id);
 
 
-struct ctdb_context *ctdb_cmdline_client(struct event_context *ev);
+struct ctdb_context *ctdb_cmdline_client(struct tevent_context *ev);
 
 struct ctdb_statistics;
 int ctdb_ctrl_statistics(struct ctdb_context *ctdb, uint32_t destnode, struct ctdb_statistics *status);
@@ -449,17 +450,6 @@ struct ctdb_uptime {
        struct timeval last_recovery_finished;
 };
 
-/*
-  definitions for different socket structures
- */
-typedef struct sockaddr_in ctdb_addr_in;
-typedef struct sockaddr_in6 ctdb_addr_in6;
-typedef union {
-       struct sockaddr sa;
-       ctdb_addr_in    ip;
-       ctdb_addr_in6   ip6;
-} ctdb_sock_addr;
-
 /*
   struct for tcp_client control
   this is an ipv4 only version of this structure used by samba
@@ -550,7 +540,8 @@ int ctdb_transaction_commit(struct ctdb_transaction_handle *h);
 
 int ctdb_ctrl_recd_ping(struct ctdb_context *ctdb);
 
-int switch_from_server_to_client(struct ctdb_context *ctdb);
+int switch_from_server_to_client(struct ctdb_context *ctdb, const char *fmt,
+                                ...);
 
 int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
                    struct timeval timeout, uint32_t destnode,