ctdb-tcp: Fix signed/unsigned comparisons by declaring as unsigned

[samba.git] / ctdb / tcp / tcp_init.c

diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index 5c53caf6cd9db2387ab997424c7a1d42221abeb0..87d628aba93b4e9794db05fc34f3b1e8793f9fa6 100644 (file)
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -17,31 +17,50 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "lib/tdb/include/tdb.h"
-#include "lib/events/events.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/time.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_private.h"
+
+#include "common/common.h"
+#include "common/logging.h"
+
 #include "ctdb_tcp.h"
 
+static int tnode_destructor(struct ctdb_tcp_node *tnode)
+{
+  //   struct ctdb_node *node = talloc_find_parent_bytype(tnode, struct ctdb_node);
+
+       if (tnode->fd != -1) {
+               close(tnode->fd);
+               tnode->fd = -1;
+       }
+
+       return 0;
+}
 
 /*
   initialise tcp portion of a ctdb node 
 */
 static int ctdb_tcp_add_node(struct ctdb_node *node)
 {
-       struct ctdb_tcp *ctcp = talloc_get_type(node->ctdb->private_data,
-                                               struct ctdb_tcp);
        struct ctdb_tcp_node *tnode;
-       tnode = talloc_zero(ctcp, struct ctdb_tcp_node);
+       tnode = talloc_zero(node, struct ctdb_tcp_node);
        CTDB_NO_MEMORY(node->ctdb, tnode);
 
        tnode->fd = -1;
        node->private_data = tnode;
+       talloc_set_destructor(tnode, tnode_destructor);
 
-       tnode->out_queue = ctdb_queue_setup(node->ctdb, ctcp, tnode->fd, CTDB_TCP_ALIGNMENT,
-                                       ctdb_tcp_tnode_cb, node);
+       tnode->out_queue = ctdb_queue_setup(node->ctdb, node, tnode->fd, CTDB_TCP_ALIGNMENT,
+                                           ctdb_tcp_tnode_cb, node, "to-node-%s", node->name);
        
        return 0;
 }
@@ -51,7 +70,7 @@ static int ctdb_tcp_add_node(struct ctdb_node *node)
 */
 static int ctdb_tcp_initialise(struct ctdb_context *ctdb)
 {
-       int i;
+       unsigned int i;
 
        /* listen on our own address */
        if (ctdb_tcp_listen(ctdb) != 0) {
@@ -59,7 +78,10 @@ static int ctdb_tcp_initialise(struct ctdb_context *ctdb)
                exit(1);
        }
 
-       for (i=0; i<ctdb->num_nodes; i++) {
+       for (i=0; i < ctdb->num_nodes; i++) {
+               if (ctdb->nodes[i]->flags & NODE_FLAGS_DELETED) {
+                       continue;
+               }
                if (ctdb_tcp_add_node(ctdb->nodes[i]) != 0) {
                        DEBUG(DEBUG_CRIT, ("methods->add_node failed at %d\n", i));
                        return -1;
@@ -72,21 +94,19 @@ static int ctdb_tcp_initialise(struct ctdb_context *ctdb)
 /*
   start the protocol going
 */
-static int ctdb_tcp_start(struct ctdb_context *ctdb)
+static int ctdb_tcp_connect_node(struct ctdb_node *node)
 {
-       int i;
+       struct ctdb_context *ctdb = node->ctdb;
+       struct ctdb_tcp_node *tnode = talloc_get_type(
+               node->private_data, struct ctdb_tcp_node);
 
-       /* startup connections to the other servers - will happen on
+       /* startup connection to the other server - will happen on
           next event loop */
-       for (i=0;i<ctdb->num_nodes;i++) {
-               struct ctdb_node *node = *(ctdb->nodes + i);
-               struct ctdb_tcp_node *tnode = talloc_get_type(
-                       node->private_data, struct ctdb_tcp_node);
-               if (!ctdb_same_address(&ctdb->address, &node->address)) {
-                       tnode->connect_te = event_add_timed(ctdb->ev, tnode, 
-                                                           timeval_zero(), 
-                                                           ctdb_tcp_node_connect, node);
-               }
+       if (!ctdb_same_address(ctdb->address, &node->address)) {
+               tnode->connect_te = tevent_add_timer(ctdb->ev, tnode,
+                                                   timeval_zero(),
+                                                   ctdb_tcp_node_connect,
+                                                   node);
        }
 
        return 0;
@@ -105,8 +125,9 @@ static void ctdb_tcp_restart(struct ctdb_node *node)
 
        ctdb_tcp_stop_connection(node);
 
-       tnode->connect_te = event_add_timed(node->ctdb->ev, tnode, timeval_zero(), 
-                                           ctdb_tcp_node_connect, node);
+       tnode->connect_te = tevent_add_timer(node->ctdb->ev, tnode,
+                                            timeval_zero(),
+                                            ctdb_tcp_node_connect, node);
 }
 
 
@@ -121,6 +142,23 @@ static void ctdb_tcp_shutdown(struct ctdb_context *ctdb)
        ctdb->private_data = NULL;
 }
 
+/*
+  start the transport
+*/
+static int ctdb_tcp_start(struct ctdb_context *ctdb)
+{
+       unsigned int i;
+
+       for (i=0; i < ctdb->num_nodes; i++) {
+               if (ctdb->nodes[i]->flags & NODE_FLAGS_DELETED) {
+                       continue;
+               }
+               ctdb_tcp_connect_node(ctdb->nodes[i]);
+       }
+
+       return 0;
+}
+
 
 /*
   transport packet allocator - allows transport to control memory for packets
@@ -140,6 +178,7 @@ static const struct ctdb_methods ctdb_tcp_methods = {
        .start        = ctdb_tcp_start,
        .queue_pkt    = ctdb_tcp_queue_pkt,
        .add_node     = ctdb_tcp_add_node,
+       .connect_node = ctdb_tcp_connect_node,
        .allocate_pkt = ctdb_tcp_allocate_pkt,
        .shutdown     = ctdb_tcp_shutdown,
        .restart      = ctdb_tcp_restart,