ctdb-protocol: Drop protocol support for setting NAT gatway capability

This is no longer used.

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

diff --git a/ctdb/protocol/protocol_api.h b/ctdb/protocol/protocol_api.h
index 6fb9cec9d4dbaae844e276bb772516fd5d1b66a4..b97a0d9a8196f7e715031a9103652ba24f502bad 100644 (file)
--- a/ctdb/protocol/protocol_api.h
+++ b/ctdb/protocol/protocol_api.h
@@ -468,10 +468,6 @@ int ctdb_reply_control_stop_node(struct ctdb_reply_control *reply);
 void ctdb_req_control_continue_node(struct ctdb_req_control *request);
 int ctdb_reply_control_continue_node(struct ctdb_reply_control *reply);
 
-void ctdb_req_control_set_natgwstate(struct ctdb_req_control *request,
-                                    uint32_t natgw_role);
-int ctdb_reply_control_set_natgwstate(struct ctdb_reply_control *reply);
-
 void ctdb_req_control_set_lmasterrole(struct ctdb_req_control *request,
                                      uint32_t lmaster_role);
 int ctdb_reply_control_set_lmasterrole(struct ctdb_reply_control *reply);

diff --git a/ctdb/protocol/protocol_client.c b/ctdb/protocol/protocol_client.c
index a4c19d9dbb48416ccdd79ee9bd0d4d53d75123e4..7c983b80001f40229f36aa5bc6126459a917cd28 100644 (file)
--- a/ctdb/protocol/protocol_client.c
+++ b/ctdb/protocol/protocol_client.c
@@ -1650,26 +1650,6 @@ int ctdb_reply_control_continue_node(struct ctdb_reply_control *reply)
        return ctdb_reply_control_generic(reply);
 }
 
-/* CTDB_CONTROL_SET_NATGWSTATE */
-
-void ctdb_req_control_set_natgwstate(struct ctdb_req_control *request,
-                                    uint32_t natgw_role)
-{
-       request->opcode = CTDB_CONTROL_SET_NATGWSTATE;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_SET_NATGWSTATE;
-       request->rdata.data.role = natgw_role;
-}
-
-int ctdb_reply_control_set_natgwstate(struct ctdb_reply_control *reply)
-{
-       return ctdb_reply_control_generic(reply);
-}
-
 /* CTDB_CONTROL_SET_LMASTERROLE */
 
 void ctdb_req_control_set_lmasterrole(struct ctdb_req_control *request,

diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c
index 1c8364e3b0c4cd5238645f2671260df40a15cfc1..c2111197522938ac05adb4957b9b7199c69913af 100644 (file)
--- a/ctdb/protocol/protocol_control.c
+++ b/ctdb/protocol/protocol_control.c
@@ -333,10 +333,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
        case CTDB_CONTROL_CONTINUE_NODE:
                break;
 
-       case CTDB_CONTROL_SET_NATGWSTATE:
-               len = ctdb_uint32_len(cd->data.role);
-               break;
-
        case CTDB_CONTROL_SET_LMASTERROLE:
                len = ctdb_uint32_len(cd->data.role);
                break;
@@ -667,10 +663,6 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
                ctdb_string_push(cd->data.reclock_file, buf);
                break;
 
-       case CTDB_CONTROL_SET_NATGWSTATE:
-               ctdb_uint32_push(cd->data.role, buf);
-               break;
-
        case CTDB_CONTROL_SET_LMASTERROLE:
                ctdb_uint32_push(cd->data.role, buf);
                break;
@@ -1023,11 +1015,6 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
                                       &cd->data.reclock_file);
                break;
 
-       case CTDB_CONTROL_SET_NATGWSTATE:
-               ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
-                                    &cd->data.role);
-               break;
-
        case CTDB_CONTROL_SET_LMASTERROLE:
                ret = ctdb_uint32_pull(buf, buflen, mem_ctx,
                                     &cd->data.role);
@@ -1447,9 +1434,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
        case CTDB_CONTROL_CONTINUE_NODE:
                break;
 
-       case CTDB_CONTROL_SET_NATGWSTATE:
-               break;
-
        case CTDB_CONTROL_SET_LMASTERROLE:
                break;
 

diff --git a/ctdb/tests/src/protocol_client_test.c b/ctdb/tests/src/protocol_client_test.c
index f5a3c35c664c1a3cc0362b961866bdec1480ca3c..4719eac8be7544eebdd7e77adfab89428dc2d062 100644 (file)
--- a/ctdb/tests/src/protocol_client_test.c
+++ b/ctdb/tests/src/protocol_client_test.c
@@ -477,10 +477,6 @@ static void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_CONTINUE_NODE:
                break;
 
-       case CTDB_CONTROL_SET_NATGWSTATE:
-               cd->data.role = rand_int(2);
-               break;
-
        case CTDB_CONTROL_SET_LMASTERROLE:
                cd->data.role = rand_int(2);
                break;
@@ -953,10 +949,6 @@ static void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd,
        case CTDB_CONTROL_CONTINUE_NODE:
                break;
 
-       case CTDB_CONTROL_SET_NATGWSTATE:
-               assert(cd->data.role == cd2->data.role);
-               break;
-
        case CTDB_CONTROL_SET_LMASTERROLE:
                assert(cd->data.role == cd2->data.role);
                break;
@@ -1429,9 +1421,6 @@ static void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_CONTINUE_NODE:
                break;
 
-       case CTDB_CONTROL_SET_NATGWSTATE:
-               break;
-
        case CTDB_CONTROL_SET_LMASTERROLE:
                break;
 
@@ -1827,9 +1816,6 @@ static void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd,
        case CTDB_CONTROL_CONTINUE_NODE:
                break;
 
-       case CTDB_CONTROL_SET_NATGWSTATE:
-               break;
-
        case CTDB_CONTROL_SET_LMASTERROLE:
                break;