X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=5394d3646c306791dcd5296401814919699f10a5;hb=531d5a904a3a91bca8b7d373fb6ab2869b31e7fa;hp=7fe80b2ba1f83e730c5f894a293afb30d29a597a;hpb=0f6f54ff8aa96d981f68b5b71c7126b8fdbead6c;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index 7fe80b2b..5394d364 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -25,7 +25,6 @@
 #include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "tevent.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
@@ -234,10 +233,11 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 	return nfd;
 }
 
-void retry_outgoing(outgoing_t *outgoing)
-{
-	tevent_t *event;
+static void retry_outgoing_handler(int fd, short events, void *data) {
+	retry_outgoing(data);
+}
 
+void retry_outgoing(outgoing_t *outgoing) {
 	cp();
 
 	outgoing->timeout += 5;
@@ -245,11 +245,8 @@ void retry_outgoing(outgoing_t *outgoing)
 	if(outgoing->timeout > maxtimeout)
 		outgoing->timeout = maxtimeout;
 
-	event = new_tevent();
-	event->handler = (event_handler_t) setup_outgoing_connection;
-	event->time = now + outgoing->timeout;
-	event->data = outgoing;
-	tevent_add(event);
+	timeout_set(&outgoing->ev, retry_outgoing_handler, outgoing);
+	event_add(&outgoing->ev, &(struct timeval){outgoing->timeout, 0});
 
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE,
 			   _("Trying to re-establish outgoing connection in %d seconds"),
@@ -395,17 +392,16 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 	c->outgoing = outgoing;
 	c->last_ping_time = now;
 
+	connection_add(c);
+
+	do_outgoing_connection(c);
+
 	event_set(&c->ev, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
 	event_set(&c->outev, c->socket, EV_WRITE | EV_PERSIST, flush_meta, c);
 	if(event_add(&c->ev, NULL) < 0) {
-		logger(LOG_ERR, _("event_add failed: %s"), strerror(errno));
-		connection_del(c);
-		return;
+		logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+		abort();
 	}
-		
-	connection_add(c);
-
-	do_outgoing_connection(c);
 }
 
 /*