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

diff --git a/src/net_socket.c b/src/net_socket.c
index 7fe80b2b..1686c609 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -22,10 +22,9 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "tevent.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
@@ -52,8 +51,7 @@ int listen_sockets;
 
 /* Setup sockets */
 
-static void configure_tcp(connection_t *c)
-{
+static void configure_tcp(connection_t *c) {
 	int option;
 
 #ifdef O_NONBLOCK
@@ -81,8 +79,7 @@ static void configure_tcp(connection_t *c)
 #endif
 }
 
-int setup_listen_socket(const sockaddr_t *sa)
-{
+int setup_listen_socket(const sockaddr_t *sa) {
 	int nfd;
 	char *addrstr;
 	int option;
@@ -140,8 +137,7 @@ int setup_listen_socket(const sockaddr_t *sa)
 	return nfd;
 }
 
-int setup_vpn_in_socket(const sockaddr_t *sa)
-{
+int setup_vpn_in_socket(const sockaddr_t *sa) {
 	int nfd;
 	char *addrstr;
 	int option;
@@ -234,10 +230,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) {
+	setup_outgoing_connection(data);
+}
 
+void retry_outgoing(outgoing_t *outgoing) {
 	cp();
 
 	outgoing->timeout += 5;
@@ -245,32 +242,28 @@ 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"),
 			   outgoing->timeout);
 }
 
-void finish_connecting(connection_t *c)
-{
+void finish_connecting(connection_t *c) {
 	cp();
 
 	ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
 
 	configure_tcp(c);
 
-	c->last_ping_time = now;
+	c->last_ping_time = time(NULL);
+	c->status.connecting = false;
 
 	send_id(c);
 }
 
-void do_outgoing_connection(connection_t *c)
-{
+void do_outgoing_connection(connection_t *c) {
 	char *address, *port;
 	int result;
 
@@ -281,8 +274,9 @@ begin:
 		if(!c->outgoing->cfg) {
 			ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
 					   c->name);
-			c->status.remove = true;
 			retry_outgoing(c->outgoing);
+			c->outgoing = NULL;
+			connection_del(c);
 			return;
 		}
 
@@ -355,8 +349,17 @@ begin:
 	return;
 }
 
-void setup_outgoing_connection(outgoing_t *outgoing)
-{
+void handle_meta_write(struct bufferevent *event, void *data) {
+	logger(LOG_EMERG, _("handle_meta_write() called"));
+}
+
+void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
+	connection_t *c = data;
+	logger(LOG_EMERG, _("handle_meta_connection_error() called: %d: %s"), what, strerror(errno));
+	terminate_connection(c, c->status.active);
+}
+
+void setup_outgoing_connection(outgoing_t *outgoing) {
 	connection_t *c;
 	node_t *n;
 
@@ -393,27 +396,27 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 	}
 
 	c->outgoing = outgoing;
-	c->last_ping_time = now;
+	c->last_ping_time = time(NULL);
 
-	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;
-	}
-		
 	connection_add(c);
 
 	do_outgoing_connection(c);
+
+	event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+	event_add(&c->inevent, NULL);
+	c->buffer = bufferevent_new(c->socket, handle_meta_connection_data, handle_meta_write, handle_meta_connection_error, c);
+	if(!c->buffer) {
+		logger(LOG_EMERG, _("bufferevent_new() failed: %s"), strerror(errno));
+		abort();
+	}
+	bufferevent_disable(c->buffer, EV_READ);
 }
 
 /*
   accept a new tcp connect and create a
   new connection
 */
-void handle_new_meta_connection(int sock, short events, void *data)
-{
+void handle_new_meta_connection(int sock, short events, void *data) {
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
@@ -440,17 +443,18 @@ void handle_new_meta_connection(int sock, short events, void *data)
 	c->address = sa;
 	c->hostname = sockaddr2hostname(&sa);
 	c->socket = fd;
-	c->last_ping_time = now;
+	c->last_ping_time = time(NULL);
 
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection from %s"), c->hostname);
 
-	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;
+	event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+	event_add(&c->inevent, NULL);
+	c->buffer = bufferevent_new(c->socket, NULL, handle_meta_write, handle_meta_connection_error, c);
+	if(!c->buffer) {
+		logger(LOG_EMERG, _("bufferevent_new() failed: %s"), strerror(errno));
+		abort();
 	}
+	bufferevent_disable(c->buffer, EV_READ);
 		
 	configure_tcp(c);
 
@@ -460,8 +464,7 @@ void handle_new_meta_connection(int sock, short events, void *data)
 	send_id(c);
 }
 
-void try_outgoing_connections(void)
-{
+void try_outgoing_connections(void) {
 	static config_t *cfg = NULL;
 	char *name;
 	outgoing_t *outgoing;