diff options
author | Martin Schwenke <martin@meltin.net> | 2016-03-11 15:48:26 +1100 |
---|---|---|
committer | Amitay Isaacs <amitay@samba.org> | 2016-04-01 04:42:12 +0200 |
commit | f0a83d865c761c76e0adc428cdfed350fc99a7fb (patch) | |
tree | 924f10938851b1a6583a2ddc27bf1196f1541332 /ctdb/client | |
parent | efd371659f5cdf8d97eece8912e595ef7172f808 (diff) | |
download | samba-f0a83d865c761c76e0adc428cdfed350fc99a7fb.tar.gz |
ctdb-client: Drop killtcp client functions
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/client')
-rw-r--r-- | ctdb/client/client.h | 5 | ||||
-rw-r--r-- | ctdb/client/client_control_sync.c | 29 | ||||
-rw-r--r-- | ctdb/client/ctdb_client.c | 25 |
3 files changed, 0 insertions, 59 deletions
diff --git a/ctdb/client/client.h b/ctdb/client/client.h index 98690041a46..1060d2e175d 100644 --- 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 75156232c60..2c71b36458f 100644 --- 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 9fae604be08..aae3853ed48 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -3104,31 +3104,6 @@ int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb, } /* - 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 */ int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb, |