ctdb-daemon: Stop using tevent compatibility definitions

[amitay/samba.git] / ctdb / ib / ibw_ctdb.c

diff --git a/ctdb/ib/ibw_ctdb.c b/ctdb/ib/ibw_ctdb.c
index dfe4adc6d3e485cd22c68ea3f0af240afd4241cb..96b126c4eaa3a07355ff8f6fc14be87c20fdafae 100644 (file)
--- a/ctdb/ib/ibw_ctdb.c
+++ b/ctdb/ib/ibw_ctdb.c
@@ -8,7 +8,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,18 +17,31 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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 <assert.h>
 #include "ctdb_private.h"
 #include "ibwrapper.h"
 #include "ibw_ctdb.h"
 
+int ctdb_ibw_get_address(struct ctdb_context *ctdb,
+       const char *address, struct in_addr *addr)
+{
+       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", 
+                                      address);
+                       return -1;
+               }
+               memcpy(addr, he->h_addr, he->h_length);
+       }
+       return 0;
+}
+
 int ctdb_ibw_node_connect(struct ctdb_node *node)
 {
        struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node);
@@ -36,27 +49,23 @@ int ctdb_ibw_node_connect(struct ctdb_node *node)
 
        assert(cn!=NULL);
        assert(cn->conn!=NULL);
-       struct sockaddr_in sock_out;
 
-       memset(&sock_out, 0, sizeof(struct sockaddr_in));
-       inet_pton(AF_INET, node->address.address, &sock_out.sin_addr);
-       sock_out.sin_port = htons(node->address.port);
-       sock_out.sin_family = PF_INET;
-
-       rc = ibw_connect(cn->conn, &sock_out, node);
+       rc = ibw_connect(cn->conn, &node->address.ip, node);
        if (rc) {
-               DEBUG(0, ("ctdb_ibw_node_connect/ibw_connect failed - retrying...\n"));
+               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);
 
@@ -75,7 +84,7 @@ int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn)
                case IBWS_CONNECT_REQUEST: /* after [IBWS_READY + incoming request] */
                                /* => [(ibw_accept)IBWS_READY | (ibw_disconnect)STOPPED | ERROR] */
                        if (ibw_accept(ctx, conn, NULL)) {
-                               DEBUG(0, ("connstate_handler/ibw_accept failed\n"));
+                               DEBUG(DEBUG_ERR, ("connstate_handler/ibw_accept failed\n"));
                                return -1;
                        } /* else continue in IBWC_CONNECTED */
                        break;
@@ -119,11 +128,12 @@ int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn)
                                struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node);
                                struct ibw_ctx *ictx = cn->conn->ctx;
 
-                               DEBUG(10, ("IBWC_ERROR, reconnecting...\n"));
+                               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:
@@ -149,6 +159,8 @@ int ctdb_ibw_receive_handler(struct ibw_conn *conn, void *buf, int n)
         * and being reused for next receive
         * noticed that HL requires talloc-ed memory to be stolen */
        buf2 = talloc_zero_size(conn, n);
+       CTDB_NO_MEMORY(ctdb, buf2);
+
        memcpy(buf2, buf, n);
 
        ctdb->upcalls->recv_pkt(ctdb, (uint8_t *)buf2, (uint32_t)n);