ctdb-tests: Strengthen some tests

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

diff --git a/ctdb/ib/ibw_ctdb_init.c b/ctdb/ib/ibw_ctdb_init.c
index fa2ddda5affdecbfff7031a1acab9d0632aee024..7e77ec08031a4c6cbfd94a48d1b404f811913d88 100644 (file)
--- a/ctdb/ib/ibw_ctdb_init.c
+++ b/ctdb/ib/ibw_ctdb_init.c
@@ -20,27 +20,31 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
-#include "lib/events/events.h"
-#include <system/network.h>
+#include "replace.h"
+#include "system/network.h"
+
 #include <assert.h>
+#include <talloc.h>
+#include <tevent.h>
+
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
 #include "ctdb_private.h"
+
+#include "common/common.h"
+#include "common/logging.h"
+
 #include "ibwrapper.h"
 #include "ibw_ctdb.h"
 
 static int ctdb_ibw_listen(struct ctdb_context *ctdb, int backlog)
 {
        struct ibw_ctx *ictx = talloc_get_type(ctdb->private_data, struct ibw_ctx);
-       struct sockaddr_in my_addr;
 
        assert(ictx!=NULL);
-       memset(&my_addr, 0, sizeof(struct sockaddr_in));
-       my_addr.sin_port = htons(ctdb->address.port);
-       my_addr.sin_family = PF_INET;
-       if (ctdb_ibw_get_address(ctdb, ctdb->address.address, &my_addr.sin_addr))
-               return -1;
 
-       if (ibw_bind(ictx, &my_addr)) {
+       if (ibw_bind(ictx, &ctdb->address->ip)) {
                DEBUG(DEBUG_CRIT, ("ctdb_ibw_listen: ibw_bind failed\n"));
                return -1;
        }
@@ -100,12 +104,12 @@ static int ctdb_ibw_initialise(struct ctdb_context *ctdb)
  */
 static int ctdb_ibw_start(struct ctdb_context *ctdb)
 {
-       int i, ret;
+       int i;
 
        /* everything async here */
        for (i=0;i<ctdb->num_nodes;i++) {
                struct ctdb_node *node = ctdb->nodes[i];
-               if (!ctdb_same_address(&ctdb->address, &node->address)) {
+               if (!ctdb_same_address(ctdb->address, &node->address)) {
                        ctdb_ibw_node_connect(node);
                }
        }
@@ -164,15 +168,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);
-               if (p == NULL) {
-                       DEBUG(DEBUG_ERR, ("talloc_zero failed.\n"));
-                       return -1;
-               }
+               CTDB_NO_MEMORY(node->ctdb, p);
+
                p->data = talloc_memdup(p, data, length);
-               if (p->data == NULL) {
-                       DEBUG(DEBUG_ERR, ("talloc_memdup failed.\n"));
-                       return -1;
-               }
+               CTDB_NO_MEMORY(node->ctdb, p->data);
+
                p->length = length;
 
                DLIST_ADD_AFTER(cn->queue, p, cn->queue_last);