ctdb-daemon: Drop struct ctdb_control_killtcp

Just use ctdb_tcp_connection.  It is the same.  There are no external
users.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 3383c579a56991b857a25c7ebd357ca765e8bf54..9c7571f3ce9d898dbb4234188144f23314d2ecc7 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -3071,13 +3071,13 @@ int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb,
 int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, 
                      struct timeval timeout, 
                      uint32_t destnode,
-                     struct ctdb_control_killtcp *killtcp)
+                     struct ctdb_tcp_connection *killtcp)
 {
        TDB_DATA data;
        int32_t res;
        int ret;
 
-       data.dsize = sizeof(struct ctdb_control_killtcp);
+       data.dsize = sizeof(struct ctdb_tcp_connection);
        data.dptr  = (unsigned char *)killtcp;
 
        ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_KILL_TCP, 0, data, NULL,

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 1d91923663047fc08dfcc54e5d457f837ac8d70e..42b87ca607c23604bd99dbd6d605a48d30730262 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -607,14 +607,6 @@ struct ctdb_db_context {
           ctdb_fatal(ctdb, "Out of memory in " __location__ ); \
          }} while (0)
 
-/*
-  struct for kill_tcp control
- */
-struct ctdb_control_killtcp {
-       ctdb_sock_addr src_addr;
-       ctdb_sock_addr dst_addr;
-};
-
 /*
   struct holding a ctdb_sock_addr and an interface name,
   used to add/remove public addresses
@@ -1215,7 +1207,7 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data, ctdb_sock_addr *src, ctd
 int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, 
                      struct timeval timeout, 
                      uint32_t destnode,
-                     struct ctdb_control_killtcp *killtcp);
+                     struct ctdb_tcp_connection *killtcp);
 
 int ctdb_ctrl_add_public_ip(struct ctdb_context *ctdb, 
                      struct timeval timeout, 

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index ee69270c784899a1fc6d52e5f7212a832551b60b..2335f06ceeb5243c1563a84e7c56fbe15a6874dd 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -403,7 +403,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_modflags(ctdb, indata);
 
        case CTDB_CONTROL_KILL_TCP: 
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_killtcp));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_tcp_connection));
                return ctdb_control_kill_tcp(ctdb, indata);
 
        case CTDB_CONTROL_GET_TCP_TICKLE_LIST:

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index efc80b1ab8c36a7495c90a549ded23db45c7f10d..2f4874be018d0405c0fb14ac2a76ebbc646184c1 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -3714,7 +3714,7 @@ failed:
  */
 int32_t ctdb_control_kill_tcp(struct ctdb_context *ctdb, TDB_DATA indata)
 {
-       struct ctdb_control_killtcp *killtcp = (struct ctdb_control_killtcp *)indata.dptr;
+       struct ctdb_tcp_connection *killtcp = (struct ctdb_tcp_connection *)indata.dptr;
 
        return ctdb_killtcp_add_connection(ctdb, &killtcp->src_addr, &killtcp->dst_addr);
 }

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 1081eeca71536a2feae9240b9060760040f8b46e..69f881f445699354e4aa2f312c6a596fa97b78fd 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -2606,7 +2606,7 @@ static int control_delip(struct ctdb_context *ctdb, int argc, const char **argv)
 static int kill_tcp_from_file(struct ctdb_context *ctdb,
                              int argc, const char **argv)
 {
-       struct ctdb_control_killtcp *killtcp;
+       struct ctdb_tcp_connection *killtcp;
        int max_entries, current, i;
        struct timeval timeout;
        char line[128], src[128], dst[128];
@@ -2643,7 +2643,7 @@ static int kill_tcp_from_file(struct ctdb_context *ctdb,
                if (current >= max_entries) {
                        max_entries += 1024;
                        killtcp = talloc_realloc(ctdb, killtcp,
-                                                struct ctdb_control_killtcp,
+                                                struct ctdb_tcp_connection,
                                                 max_entries);
                        CTDB_NO_MEMORY(ctdb, killtcp);
                }
@@ -2673,7 +2673,7 @@ static int kill_tcp_from_file(struct ctdb_context *ctdb,
 
        for (i = 0; i < current; i++) {
 
-               data.dsize = sizeof(struct ctdb_control_killtcp);
+               data.dsize = sizeof(struct ctdb_tcp_connection);
                data.dptr  = (unsigned char *)&killtcp[i];
 
                timeout = TIMELIMIT();
@@ -2709,7 +2709,7 @@ static int kill_tcp_from_file(struct ctdb_context *ctdb,
 static int kill_tcp(struct ctdb_context *ctdb, int argc, const char **argv)
 {
        int ret;
-       struct ctdb_control_killtcp killtcp;
+       struct ctdb_tcp_connection killtcp;
 
        assert_single_node_only();