ctdb-client: Drop support for updating NAT gateway 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/client/client.h b/ctdb/client/client.h
index bce0c6b39b9a59d30e385aedac214a5e9b61e622..f2f8d6b532820b175dae30690f3f9fbfaf09d4d0 100644 (file)
--- a/ctdb/client/client.h
+++ b/ctdb/client/client.h
@@ -517,11 +517,6 @@ int ctdb_ctrl_continue_node(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                            struct ctdb_client_context *client,
                            int destnode, struct timeval timeout);
 
-int ctdb_ctrl_set_natgwstate(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                            struct ctdb_client_context *client,
-                            int destnode, struct timeval timeout,
-                            uint32_t natgw_role);
-
 int ctdb_ctrl_set_lmasterrole(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                              struct ctdb_client_context *client,
                              int destnode, struct timeval timeout,

diff --git a/ctdb/client/client_control_sync.c b/ctdb/client/client_control_sync.c
index de52b4715ce6624d205b6041a9cf26165f1d547a..7c3cda2ab6247af8e203f201151e405656cc24dd 100644 (file)
--- a/ctdb/client/client_control_sync.c
+++ b/ctdb/client/client_control_sync.c
@@ -2022,35 +2022,6 @@ int ctdb_ctrl_continue_node(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
        return 0;
 }
 
-int ctdb_ctrl_set_natgwstate(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                            struct ctdb_client_context *client,
-                            int destnode, struct timeval timeout,
-                            uint32_t natgw_role)
-{
-       struct ctdb_req_control request;
-       struct ctdb_reply_control *reply;
-       int ret;
-
-       ctdb_req_control_set_natgwstate(&request, natgw_role);
-       ret = ctdb_client_control(mem_ctx, ev, client, destnode, timeout,
-                                 &request, &reply);
-       if (ret != 0) {
-               DEBUG(DEBUG_ERR,
-                     ("Control SET_NATGWSTATE failed to node %u, ret=%d\n",
-                      destnode, ret));
-               return ret;
-       }
-
-       ret = ctdb_reply_control_set_natgwstate(reply);
-       if (ret != 0) {
-               DEBUG(DEBUG_ERR,
-                     ("Control SET_NATGWSTATE failed, ret=%d\n", ret));
-               return ret;
-       }
-
-       return 0;
-}
-
 int ctdb_ctrl_set_lmasterrole(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                              struct ctdb_client_context *client,
                              int destnode, struct timeval timeout,

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 6615730b93e8138c329f87027d3183f8486815a3..9f07472107334c91112b7141a773b0a801853c3e 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -4536,29 +4536,6 @@ int ctdb_ctrl_continue_node(struct ctdb_context *ctdb, struct timeval timeout, u
        return 0;
 }
 
-/*
-  set the natgw state for a node
- */
-int ctdb_ctrl_setnatgwstate(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, uint32_t natgwstate)
-{
-       int ret;
-       TDB_DATA data;
-       int32_t res;
-
-       data.dsize = sizeof(natgwstate);
-       data.dptr  = (uint8_t *)&natgwstate;
-
-       ret = ctdb_control(ctdb, destnode, 0, 
-                          CTDB_CONTROL_SET_NATGWSTATE, 0, data, 
-                          NULL, NULL, &res, &timeout, NULL);
-       if (ret != 0 || res != 0) {
-               DEBUG(DEBUG_ERR,(__location__ " ctdb_control for setnatgwstate failed\n"));
-               return -1;
-       }
-
-       return 0;
-}
-
 /*
   set the lmaster role for a node
  */

diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h
index e81d7bb6615c98d43f592cbedc8415cf30118df0..e1c8666c6206450e4fe8d6891894ef34322190d7 100644 (file)
--- a/ctdb/include/ctdb_client.h
+++ b/ctdb/include/ctdb_client.h
@@ -582,9 +582,6 @@ int ctdb_ctrl_stop_node(struct ctdb_context *ctdb, struct timeval timeout,
 int ctdb_ctrl_continue_node(struct ctdb_context *ctdb, struct timeval timeout,
                            uint32_t destnode);
 
-int ctdb_ctrl_setnatgwstate(struct ctdb_context *ctdb,
-                           struct timeval timeout, uint32_t destnode,
-                           uint32_t natgwstate);
 int ctdb_ctrl_setlmasterrole(struct ctdb_context *ctdb,
                             struct timeval timeout, uint32_t destnode,
                             uint32_t lmasterrole);