rename ctdb_tcp_client back to the original name ctdb_control_tcp

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 8834ec4d52c685201d601c6f705eee2056a2f54a..a25674c9b4bfecb334f4dab395dbb7b675309638 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -565,7 +565,7 @@ struct ctdb_control_set_call {
   struct for tcp_client control
   used by samba   can not modify
  */
-struct ctdb_tcp_client {
+struct ctdb_control_tcp {
        struct sockaddr_in src; // samba uses this
        struct sockaddr_in dest;// samba uses this
 };

diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index 68635d6b4395102121fc72c8111f5ac79b0d59b4..41287978667b90bb7d1fcadd265cf9dc8bdaf911 100644 (file)
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -296,7 +296,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_get_public_ips(ctdb, c, outdata);
 
        case CTDB_CONTROL_TCP_CLIENT: 
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_tcp_client));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_tcp));
                return ctdb_control_tcp_client(ctdb, client_id, indata);
 
        case CTDB_CONTROL_STARTUP: 

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index b33471ddaf273f7dade3b630a3be32494970420d..fb20ff17969255536b0a52d3424324a91b339313 100644 (file)
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -956,7 +956,7 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
                                TDB_DATA indata)
 {
        struct ctdb_client *client = ctdb_reqid_find(ctdb, client_id, struct ctdb_client);
-       struct ctdb_tcp_client *p = (struct ctdb_tcp_client *)indata.dptr;
+       struct ctdb_control_tcp *p = (struct ctdb_control_tcp *)indata.dptr;
        struct ctdb_tcp_list *tcp;
        struct ctdb_control_tcp_vnn t;
        int ret;