ctdb-tcp: rename ctdb_tcp_stop_connection() to ctdb_tcp_stop_outgoing()

No change in behaviour.  This makes the code self-documenting.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14295

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit 1e2a967ff41cc29c3a0d7f61a46937c68fdb90ba)

diff --git a/ctdb/tcp/ctdb_tcp.h b/ctdb/tcp/ctdb_tcp.h
index daabad74297e2e2168228a6d531b227f11841354..095056e8544544c56753cc16dfe8d9744eb09673 100644 (file)
--- a/ctdb/tcp/ctdb_tcp.h
+++ b/ctdb/tcp/ctdb_tcp.h
@@ -48,7 +48,7 @@ void ctdb_tcp_node_connect(struct tevent_context *ev, struct tevent_timer *te,
                           struct timeval t, void *private_data);
 void ctdb_tcp_read_cb(uint8_t *data, size_t cnt, void *args);
 void ctdb_tcp_tnode_cb(uint8_t *data, size_t cnt, void *private_data);
-void ctdb_tcp_stop_connection(struct ctdb_node *node);
+void ctdb_tcp_stop_outgoing(struct ctdb_node *node);
 
 #define CTDB_TCP_ALIGNMENT 8
 

diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index 6db6c6fb1385be1f5fc26ff9bf2456a1f4f94476..cc0c7bd2e47aae3f7cbb99ab41d6f2159d8178cf 100644 (file)
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -38,9 +38,9 @@
 #include "ctdb_tcp.h"
 
 /*
-  stop any connecting (established or pending) to a node
+  stop any outgoing connection (established or pending) to a node
  */
-void ctdb_tcp_stop_connection(struct ctdb_node *node)
+void ctdb_tcp_stop_outgoing(struct ctdb_node *node)
 {
        struct ctdb_tcp_node *tnode = talloc_get_type(
                node->transport_data, struct ctdb_tcp_node);
@@ -90,7 +90,7 @@ static void ctdb_node_connect_write(struct tevent_context *ev,
 
        ret = getsockopt(tnode->out_fd, SOL_SOCKET, SO_ERROR, &error, &len);
        if (ret != 0 || error != 0) {
-               ctdb_tcp_stop_connection(node);
+               ctdb_tcp_stop_outgoing(node);
                tnode->connect_te = tevent_add_timer(ctdb->ev, tnode,
                                                    timeval_current_ofs(1, 0),
                                                    ctdb_tcp_node_connect, node);
@@ -128,7 +128,7 @@ static void ctdb_node_connect_write(struct tevent_context *ev,
                                            node->name);
        if (tnode->out_queue == NULL) {
                DBG_ERR("Failed to set up outgoing queue\n");
-               ctdb_tcp_stop_connection(node);
+               ctdb_tcp_stop_outgoing(node);
                tnode->connect_te = tevent_add_timer(ctdb->ev,
                                                     tnode,
                                                     timeval_current_ofs(1, 0),
@@ -168,7 +168,7 @@ void ctdb_tcp_node_connect(struct tevent_context *ev, struct tevent_timer *te,
         ctdb_sock_addr sock_out;
        int ret;
 
-       ctdb_tcp_stop_connection(node);
+       ctdb_tcp_stop_outgoing(node);
 
        sock_out = node->address;
 
@@ -252,7 +252,7 @@ void ctdb_tcp_node_connect(struct tevent_context *ev, struct tevent_timer *te,
        return;
 
 failed:
-       ctdb_tcp_stop_connection(node);
+       ctdb_tcp_stop_outgoing(node);
        tnode->connect_te = tevent_add_timer(ctdb->ev,
                                             tnode,
                                             timeval_current_ofs(1, 0),

diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index a112b52fa0da74a8876091cbb80db572cc67f053..b0da5ad4610263d92ba2f36cdb6645cd3ad284c0 100644 (file)
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -122,7 +122,7 @@ static void ctdb_tcp_restart(struct ctdb_node *node)
 
        DEBUG(DEBUG_NOTICE,("Tearing down connection to dead node :%d\n", node->pnn));
        TALLOC_FREE(tnode->in_queue);
-       ctdb_tcp_stop_connection(node);
+       ctdb_tcp_stop_outgoing(node);
 
        tnode->connect_te = tevent_add_timer(node->ctdb->ev, tnode,
                                             timeval_zero(),