ctdb-client: Drop killtcp client functions

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

diff --git a/ctdb/client/client.h b/ctdb/client/client.h
index 98690041a46bcd9fc65f632432f8eb34091f6036..1060d2e175db41551a12956b06a12b62e476a3fd 100644 (file)
--- a/ctdb/client/client.h
+++ b/ctdb/client/client.h
@@ -384,11 +384,6 @@ int ctdb_ctrl_get_all_tunables(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                               int destnode, struct timeval timeout,
                               struct ctdb_tunable_list **tun_list);
 
-int ctdb_ctrl_kill_tcp(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                      struct ctdb_client_context *client,
-                      int destnode, struct timeval timeout,
-                      struct ctdb_connection *conn);
-
 int ctdb_ctrl_get_tcp_tickle_list(TALLOC_CTX *mem_ctx,
                                  struct tevent_context *ev,
                                  struct ctdb_client_context *client,

diff --git a/ctdb/client/client_control_sync.c b/ctdb/client/client_control_sync.c
index 75156232c60e62286ae23ead13960b667537dd3f..2c71b36458ffe3c76f6c9f605ba60419a7273e73 100644 (file)
--- a/ctdb/client/client_control_sync.c
+++ b/ctdb/client/client_control_sync.c
@@ -1084,35 +1084,6 @@ int ctdb_ctrl_get_all_tunables(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
        return 0;
 }
 
-int ctdb_ctrl_kill_tcp(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                      struct ctdb_client_context *client,
-                      int destnode, struct timeval timeout,
-                      struct ctdb_connection *conn)
-{
-       struct ctdb_req_control request;
-       struct ctdb_reply_control *reply;
-       int ret;
-
-       ctdb_req_control_kill_tcp(&request, conn);
-       ret = ctdb_client_control(mem_ctx, ev, client, destnode, timeout,
-                                 &request, &reply);
-       if (ret != 0) {
-               DEBUG(DEBUG_ERR,
-                     ("Control KILL_TCP failed to node %u, ret=%d\n",
-                      destnode, ret));
-               return ret;
-       }
-
-       ret = ctdb_reply_control_kill_tcp(reply);
-       if (ret != 0) {
-               DEBUG(DEBUG_ERR,
-                     ("Control KILL_TCP failed, ret=%d\n", ret));
-               return ret;
-       }
-
-       return 0;
-}
-
 int ctdb_ctrl_get_tcp_tickle_list(TALLOC_CTX *mem_ctx,
                                  struct tevent_context *ev,
                                  struct ctdb_client_context *client,

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 9fae604be086f42e34554a64d0ca290faf885a88..aae3853ed487de3c7d120ea8699a7f161204d0fc 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -3103,31 +3103,6 @@ int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb,
        return 0;
 }
 
-/*
-  kill a tcp connection
- */
-int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, 
-                     struct timeval timeout, 
-                     uint32_t destnode,
-                     struct ctdb_connection *killtcp)
-{
-       TDB_DATA data;
-       int32_t res;
-       int ret;
-
-       data.dsize = sizeof(struct ctdb_connection);
-       data.dptr  = (unsigned char *)killtcp;
-
-       ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_KILL_TCP, 0, data, NULL,
-                          NULL, &res, &timeout, NULL);
-       if (ret != 0 || res != 0) {
-               DEBUG(DEBUG_ERR,(__location__ " ctdb_control for killtcp failed\n"));
-               return -1;
-       }
-
-       return 0;
-}
-
 /*
   send a gratious arp
  */

diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h
index e1c8666c6206450e4fe8d6891894ef34322190d7..08ba9206c52f6068fc3bfcc69786eb0027644b39 100644 (file)
--- a/ctdb/include/ctdb_client.h
+++ b/ctdb/include/ctdb_client.h
@@ -406,10 +406,6 @@ int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb,
                            struct timeval timeout, uint32_t destnode,
                            struct ctdb_addr_info_old *pub);
 
-int ctdb_ctrl_killtcp(struct ctdb_context *ctdb,
-                     struct timeval timeout, uint32_t destnode,
-                     struct ctdb_connection *killtcp);
-
 int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb,
                           struct timeval timeout, uint32_t destnode,
                           ctdb_sock_addr *addr, const char *ifname);