HACK ctdb/ib

[metze/samba/wip.git] / ctdb / ib / ibw_ctdb.c

diff --git a/ctdb/ib/ibw_ctdb.c b/ctdb/ib/ibw_ctdb.c
index 5664c193acb95bbc1c776ef0826f244de2240fe6..496a9f6ddf1726f2bc4db3d2ffc7b2e05bb63418 100644 (file)
--- a/ctdb/ib/ibw_ctdb.c
+++ b/ctdb/ib/ibw_ctdb.c
@@ -20,13 +20,24 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
-#include "lib/tevent/tevent.h"
-#include <system/network.h>
+#include "replace.h"
+#include "system/network.h"
+
 #include <assert.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 "ibwrapper.h"
 #include "ibw_ctdb.h"
+#include "lib/util/dlinklist.h"
 
 int ctdb_ibw_get_address(struct ctdb_context *ctdb,
        const char *address, struct in_addr *addr)
@@ -34,7 +45,7 @@ int ctdb_ibw_get_address(struct ctdb_context *ctdb,
        if (inet_pton(AF_INET, address, addr) <= 0) {
                struct hostent *he = gethostbyname(address);
                if (he == NULL || he->h_length > sizeof(*addr)) {
-                       ctdb_set_error(ctdb, "invalid nework address '%s'\n", 
+                       ctdb_set_error(ctdb, "invalid network address '%s'\n", 
                                       address);
                        return -1;
                }
@@ -45,35 +56,29 @@ int ctdb_ibw_get_address(struct ctdb_context *ctdb,
 
 int ctdb_ibw_node_connect(struct ctdb_node *node)
 {
-       struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node);
+       struct ctdb_ibw_node *cn = talloc_get_type(node->transport_data,
+                                                  struct ctdb_ibw_node);
        int     rc;
 
        assert(cn!=NULL);
        assert(cn->conn!=NULL);
-       struct sockaddr_in sock_out;
-
-       memset(&sock_out, 0, sizeof(struct sockaddr_in));
-       sock_out.sin_port = htons(node->address.port);
-       sock_out.sin_family = PF_INET;
-       if (ctdb_ibw_get_address(node->ctdb, node->address.address, &sock_out.sin_addr)) {
-               DEBUG(DEBUG_ERR, ("ctdb_ibw_node_connect failed\n"));
-               return -1;
-       }
 
-       rc = ibw_connect(cn->conn, &sock_out, node);
+       rc = ibw_connect(cn->conn, &node->address.ip, node);
        if (rc) {
                DEBUG(DEBUG_ERR, ("ctdb_ibw_node_connect/ibw_connect failed - retrying...\n"));
                /* try again once a second */
-               event_add_timed(node->ctdb->ev, node, timeval_current_ofs(1, 0), 
-                       ctdb_ibw_node_connect_event, node);
+               tevent_add_timer(node->ctdb->ev, node,
+                                timeval_current_ofs(1, 0),
+                                ctdb_ibw_node_connect_event, node);
        }
 
        /* continues at ibw_ctdb.c/IBWC_CONNECTED in good case */
        return 0;
 }
 
-void ctdb_ibw_node_connect_event(struct event_context *ev, struct timed_event *te, 
-       struct timeval t, void *private_data)
+void ctdb_ibw_node_connect_event(struct tevent_context *ev,
+                                struct tevent_timer *te,
+                                struct timeval t, void *private_data)
 {
        struct ctdb_node *node = talloc_get_type(private_data, struct ctdb_node);
 
@@ -115,7 +120,9 @@ int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn)
                case IBWC_CONNECTED: { /* after ibw_accept or ibw_connect */
                        struct ctdb_node *node = talloc_get_type(conn->conn_userdata, struct ctdb_node);
                        if (node!=NULL) { /* after ibw_connect */
-                               struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node);
+                               struct ctdb_ibw_node *cn = talloc_get_type(
+                                       node->transport_data,
+                                       struct ctdb_ibw_node);
 
                                node->ctdb->upcalls->node_connected(node);
                                ctdb_flush_cn_queue(cn);
@@ -133,14 +140,17 @@ int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn)
                case IBWC_ERROR: {
                        struct ctdb_node *node = talloc_get_type(conn->conn_userdata, struct ctdb_node);
                        if (node!=NULL) {
-                               struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node);
+                               struct ctdb_ibw_node *cn = talloc_get_type(
+                                       node->transport_data,
+                                       struct ctdb_ibw_node);
                                struct ibw_ctx *ictx = cn->conn->ctx;
 
                                DEBUG(DEBUG_DEBUG, ("IBWC_ERROR, reconnecting...\n"));
                                talloc_free(cn->conn); /* internal queue content is destroyed */
                                cn->conn = (void *)ibw_conn_new(ictx, node);
-                               event_add_timed(node->ctdb->ev, node, timeval_current_ofs(1, 0),
-                                       ctdb_ibw_node_connect_event, node);
+                               tevent_add_timer(node->ctdb->ev, node,
+                                                timeval_current_ofs(1, 0),
+                                                ctdb_ibw_node_connect_event, node);
                        }
                } break;
                default: