Merge branch '1.3' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.3

[sahlberg/ctdb.git] / ib / ibw_ctdb_init.c

diff --git a/ib/ibw_ctdb_init.c b/ib/ibw_ctdb_init.c
index 28b7a0374c63f7300798ad7b2be7921938698094..fed1381f6dfb8daca1d3f169aae4d688ac4925f6 100644 (file)
--- a/ib/ibw_ctdb_init.c
+++ b/ib/ibw_ctdb_init.c
@@ -21,7 +21,7 @@
  */
 
 #include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
 #include <system/network.h>
 #include <assert.h>
 #include "ctdb_private.h"
@@ -41,12 +41,12 @@ static int ctdb_ibw_listen(struct ctdb_context *ctdb, int backlog)
                return -1;
 
        if (ibw_bind(ictx, &my_addr)) {
-               DEBUG(0, ("ctdb_ibw_listen: ibw_bind failed\n"));
+               DEBUG(DEBUG_CRIT, ("ctdb_ibw_listen: ibw_bind failed\n"));
                return -1;
        }
 
        if (ibw_listen(ictx, backlog)) {
-               DEBUG(0, ("ctdb_ibw_listen: ibw_listen failed\n"));
+               DEBUG(DEBUG_CRIT, ("ctdb_ibw_listen: ibw_listen failed\n"));
                return -1;
        }
 
@@ -82,7 +82,7 @@ static int ctdb_ibw_initialise(struct ctdb_context *ctdb)
 
        for (i=0; i<ctdb->num_nodes; i++) {
                if (ctdb_ibw_add_node(ctdb->nodes[i]) != 0) {
-                       DEBUG(0, ("methods->add_node failed at %d\n", i));
+                       DEBUG(DEBUG_CRIT, ("methods->add_node failed at %d\n", i));
                        return -1;
                }
        }
@@ -118,7 +118,7 @@ static int ctdb_ibw_send_pkt(struct ibw_conn *conn, uint8_t *data, uint32_t leng
        void    *buf, *key;
 
        if (ibw_alloc_send_buf(conn, &buf, &key, length)) {
-               DEBUG(0, ("queue_pkt/ibw_alloc_send_buf failed\n"));
+               DEBUG(DEBUG_ERR, ("queue_pkt/ibw_alloc_send_buf failed\n"));
                return -1;
        }
 
@@ -156,7 +156,7 @@ static int ctdb_ibw_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t le
        assert(cn!=NULL);
 
        if (cn->conn==NULL) {
-               DEBUG(0, ("ctdb_ibw_queue_pkt: conn is NULL\n"));
+               DEBUG(DEBUG_ERR, ("ctdb_ibw_queue_pkt: conn is NULL\n"));
                return -1;
        }
 
@@ -164,7 +164,11 @@ static int ctdb_ibw_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t le
                rc = ctdb_ibw_send_pkt(cn->conn, data, length);
        } else {
                struct ctdb_ibw_msg *p = talloc_zero(cn, struct ctdb_ibw_msg);
+               CTDB_NO_MEMORY(node->ctdb, p);
+
                p->data = talloc_memdup(p, data, length);
+               CTDB_NO_MEMORY(node->ctdb, p->data);
+
                p->length = length;
 
                DLIST_ADD_AFTER(cn->queue, p, cn->queue_last);
@@ -180,7 +184,7 @@ static int ctdb_ibw_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t le
 static void ctdb_ibw_restart(struct ctdb_node *node)
 {
        /* TODO: implement this method for IB */
-       DEBUG(0,("WARNING: method restart is not yet implemented for IB\n"));
+       DEBUG(DEBUG_ALERT,("WARNING: method restart is not yet implemented for IB\n"));
 }
 
 /*
@@ -222,7 +226,7 @@ int ctdb_ibw_init(struct ctdb_context *ctdb)
 {
        struct ibw_ctx *ictx;
 
-       DEBUG(10, ("ctdb_ibw_init invoked...\n"));
+       DEBUG(DEBUG_DEBUG, ("ctdb_ibw_init invoked...\n"));
        ictx = ibw_init(
                NULL, //struct ibw_initattr *attr, /* TODO */
                0, //int nattr, /* TODO */
@@ -232,13 +236,13 @@ int ctdb_ibw_init(struct ctdb_context *ctdb)
                ctdb->ev);
 
        if (ictx==NULL) {
-               DEBUG(0, ("ctdb_ibw_init: ibw_init failed\n"));
+               DEBUG(DEBUG_CRIT, ("ctdb_ibw_init: ibw_init failed\n"));
                return -1;
        }
 
        ctdb->methods = &ctdb_ibw_methods;
        ctdb->private_data = ictx;
        
-       DEBUG(10, ("ctdb_ibw_init succeeded.\n"));
+       DEBUG(DEBUG_DEBUG, ("ctdb_ibw_init succeeded.\n"));
        return 0;
 }