ctdb-protocol: Drop killtcp protocol support

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

diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index 3914c69209127e29d9c58a649d5776e65ff0dad8..9c112df6be7b7ab006ccf75294fd7b4d9ae59bf8 100644 (file)
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -273,7 +273,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS          = 0,
                    CTDB_CONTROL_GET_PUBLIC_IPSv4        = 51, /* obsolete */
                    CTDB_CONTROL_MODIFY_FLAGS            = 52,
                    CTDB_CONTROL_GET_ALL_TUNABLES        = 53,
-                   CTDB_CONTROL_KILL_TCP                = 54,
+                   CTDB_CONTROL_KILL_TCP                = 54, /* obsolete */
                    CTDB_CONTROL_GET_TCP_TICKLE_LIST     = 55,
                    CTDB_CONTROL_SET_TCP_TICKLE_LIST     = 56,
                    CTDB_CONTROL_REGISTER_SERVER_ID      = 57,

diff --git a/ctdb/protocol/protocol_api.h b/ctdb/protocol/protocol_api.h
index 40753a9de976336463e61bdd31c709f50efd6fae..f23ca4fd258271c1532107035fafe101d9a8ac55 100644 (file)
--- a/ctdb/protocol/protocol_api.h
+++ b/ctdb/protocol/protocol_api.h
@@ -323,10 +323,6 @@ int ctdb_reply_control_get_all_tunables(struct ctdb_reply_control *reply,
                                        TALLOC_CTX *mem_ctx,
                                        struct ctdb_tunable_list **tun_list);
 
-void ctdb_req_control_kill_tcp(struct ctdb_req_control *request,
-                              struct ctdb_connection *conn);
-int ctdb_reply_control_kill_tcp(struct ctdb_reply_control *reply);
-
 void ctdb_req_control_get_tcp_tickle_list(struct ctdb_req_control *request,
                                          ctdb_sock_addr *addr);
 int ctdb_reply_control_get_tcp_tickle_list(struct ctdb_reply_control *reply,

diff --git a/ctdb/protocol/protocol_client.c b/ctdb/protocol/protocol_client.c
index 6466fcaf901be8a27242058a5a3b4aaa1d902dc5..7a44f044ad9aa86445065e56aacb935b4250d856 100644 (file)
--- a/ctdb/protocol/protocol_client.c
+++ b/ctdb/protocol/protocol_client.c
@@ -898,26 +898,6 @@ int ctdb_reply_control_get_all_tunables(struct ctdb_reply_control *reply,
        return reply->status;
 }
 
-/* CTDB_CONTROL_KILL_TCP */
-
-void ctdb_req_control_kill_tcp(struct ctdb_req_control *request,
-                              struct ctdb_connection *conn)
-{
-       request->opcode = CTDB_CONTROL_KILL_TCP;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_KILL_TCP;
-       request->rdata.data.conn = conn;
-}
-
-int ctdb_reply_control_kill_tcp(struct ctdb_reply_control *reply)
-{
-       return ctdb_reply_control_generic(reply);
-}
-
 /* CTDB_CONTROL_GET_TCP_TICKLE_LIST */
 
 void ctdb_req_control_get_tcp_tickle_list(struct ctdb_req_control *request,

diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c
index 57737ab678fcdc014f7fc0108c20fe850bf299cc..c0fa6adaecf846bde52f1fac24e6687a46032385 100644 (file)
--- a/ctdb/protocol/protocol_control.c
+++ b/ctdb/protocol/protocol_control.c
@@ -203,10 +203,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
        case CTDB_CONTROL_GET_ALL_TUNABLES:
                break;
 
-       case CTDB_CONTROL_KILL_TCP:
-               len = ctdb_connection_len(cd->data.conn);
-               break;
-
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
                len = ctdb_sock_addr_len(cd->data.addr);
                break;
@@ -587,10 +583,6 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
                ctdb_node_flag_change_push(cd->data.flag_change, buf);
                break;
 
-       case CTDB_CONTROL_KILL_TCP:
-               ctdb_connection_push(cd->data.conn, buf);
-               break;
-
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
                ctdb_sock_addr_push(cd->data.addr, buf);
                break;
@@ -929,11 +921,6 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
                                                 &cd->data.flag_change);
                break;
 
-       case CTDB_CONTROL_KILL_TCP:
-               ret = ctdb_connection_pull(buf, buflen, mem_ctx,
-                                          &cd->data.conn);
-               break;
-
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
                ret = ctdb_sock_addr_pull(buf, buflen, mem_ctx,
                                          &cd->data.addr);
@@ -1355,9 +1342,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
                len = ctdb_tunable_list_len(cd->data.tun_list);
                break;
 
-       case CTDB_CONTROL_KILL_TCP:
-               break;
-
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
                len = ctdb_tickle_list_len(cd->data.tickles);
                break;

diff --git a/ctdb/tests/src/protocol_client_test.c b/ctdb/tests/src/protocol_client_test.c
index 659594b417179b80e09f58884a9fec1b1755cf88..b146dbb0c52b43992cbce2b882442838fe6611a4 100644 (file)
--- a/ctdb/tests/src/protocol_client_test.c
+++ b/ctdb/tests/src/protocol_client_test.c
@@ -308,12 +308,6 @@ static void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_GET_ALL_TUNABLES:
                break;
 
-       case CTDB_CONTROL_KILL_TCP:
-               cd->data.conn = talloc(mem_ctx, struct ctdb_connection);
-               assert(cd->data.conn != NULL);
-               fill_ctdb_connection(mem_ctx, cd->data.conn);
-               break;
-
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
                cd->data.addr = talloc(mem_ctx, ctdb_sock_addr);
                assert(cd->data.addr != NULL);
@@ -828,10 +822,6 @@ static void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd,
        case CTDB_CONTROL_GET_ALL_TUNABLES:
                break;
 
-       case CTDB_CONTROL_KILL_TCP:
-               verify_ctdb_connection(cd->data.conn, cd2->data.conn);
-               break;
-
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
                verify_ctdb_sock_addr(cd->data.addr, cd2->data.addr);
                break;
@@ -1315,9 +1305,6 @@ static void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx,
                fill_ctdb_tunable_list(mem_ctx, cd->data.tun_list);
                break;
 
-       case CTDB_CONTROL_KILL_TCP:
-               break;
-
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
                cd->data.tickles = talloc(mem_ctx, struct ctdb_tickle_list);
                assert(cd->data.tickles != NULL);
@@ -1736,9 +1723,6 @@ static void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd,
                verify_ctdb_tunable_list(cd->data.tun_list, cd2->data.tun_list);
                break;
 
-       case CTDB_CONTROL_KILL_TCP:
-               break;
-
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
                verify_ctdb_tickle_list(cd->data.tickles, cd2->data.tickles);
                break;