X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=730cf6b8e56f5f00ffce0fa12ec34e6a7334aedd;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hp=d8bb007876320dbe72536a78748e15cac0b87a7d;hpb=d1dcdf8eb6f800704be426b1ce6f6c1a8e65ba0d;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index d8bb0078..730cf6b8 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 "event.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
@@ -34,8 +33,6 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#include <assert.h>
-
 /* Needed on Mac OS/X */
 #ifndef SOL_TCP
 #define SOL_TCP IPPROTO_TCP
@@ -72,12 +69,12 @@ static void configure_tcp(connection_t *c) {
 
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
 	option = 1;
-	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof(option));
+	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof option);
 #endif
 
 #if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
 	option = IPTOS_LOWDELAY;
-	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof(option));
+	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof option);
 #endif
 }
 
@@ -110,63 +107,6 @@ static bool bind_to_interface(int sd) {
 	return true;
 }
 
-static bool bind_to_address(connection_t *c) {
-	char *node;
-	struct addrinfo *ai_list;
-	struct addrinfo *ai_ptr;
-	struct addrinfo ai_hints;
-	int status;
-
-	assert(c != NULL);
-	assert(c->socket >= 0);
-
-	node = NULL;
-	if(!get_config_string(lookup_config(config_tree, "BindToAddress"),
-				&node))
-		return true;
-
-	assert(node != NULL);
-
-	memset(&ai_hints, 0, sizeof(ai_hints));
-	ai_hints.ai_family = c->address.sa.sa_family;
-	/* We're called from `do_outgoing_connection' only. */
-	ai_hints.ai_socktype = SOCK_STREAM;
-	ai_hints.ai_protocol = IPPROTO_TCP;
-
-	ai_list = NULL;
-
-	status = getaddrinfo(node, /* service = */ NULL,
-			&ai_hints, &ai_list);
-	if(status) {
-		free(node);
-		logger(LOG_WARNING, "Error looking up %s port %s: %s",
-				node, "any", gai_strerror(status));
-		return false;
-	}
-	assert(ai_list != NULL);
-
-	status = -1;
-	for(ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) {
-		status = bind(c->socket,
-				ai_list->ai_addr, ai_list->ai_addrlen);
-		if(!status)
-			break;
-	}
-
-
-	if(status) {
-		logger(LOG_ERR, "Can't bind to %s/tcp: %s", node, sockstrerror(sockerrno));
-	} else ifdebug(CONNECTIONS) {
-		logger(LOG_DEBUG, "Successfully bound outgoing "
-				"TCP socket to %s", node);
-	}
-
-	free(node);
-	freeaddrinfo(ai_list);
-
-	return status ? false : true;
-}
-
 int setup_listen_socket(const sockaddr_t *sa) {
 	int nfd;
 	char *addrstr;
@@ -187,7 +127,7 @@ int setup_listen_socket(const sockaddr_t *sa) {
 	/* Optimize TCP settings */
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
 
 #if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
 	if(sa->sa.sa_family == AF_INET6)
@@ -199,10 +139,10 @@ int setup_listen_socket(const sockaddr_t *sa) {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
 		struct ifreq ifr;
 
-		memset(&ifr, 0, sizeof(ifr));
+		memset(&ifr, 0, sizeof ifr);
 		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 
-		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr))) {
+		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof ifr)) {
 			closesocket(nfd);
 			logger(LOG_ERR, "Can't bind to interface %s: %s", iface,
 				   strerror(sockerrno));
@@ -269,7 +209,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 #endif
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
 
 	if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf)))
 		logger(LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, strerror(errno));
@@ -330,19 +270,18 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 	return nfd;
 } /* int setup_vpn_in_socket */
 
+static void retry_outgoing_handler(int fd, short events, void *data) {
+	setup_outgoing_connection(data);
+}
+
 void retry_outgoing(outgoing_t *outgoing) {
 	outgoing->timeout += 5;
 
 	if(outgoing->timeout > maxtimeout)
 		outgoing->timeout = maxtimeout;
 
-	if(outgoing->event)
-		event_del(outgoing->event);
-	outgoing->event = new_event();
-	outgoing->event->handler = (event_handler_t) setup_outgoing_connection;
-	outgoing->event->time = now + outgoing->timeout;
-	outgoing->event->data = outgoing;
-	event_add(outgoing->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",
@@ -354,12 +293,13 @@ void finish_connecting(connection_t *c) {
 
 	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) {
+bool do_outgoing_connection(connection_t *c) {
 	char *address, *port, *space;
 	int result;
 
@@ -373,10 +313,10 @@ 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;
-			return;
+			connection_del(c);
+			return false;
 		}
 
 		get_config_string(c->outgoing->cfg, &address);
@@ -434,7 +374,6 @@ begin:
 #endif
 
 	bind_to_interface(c->socket);
-	bind_to_address(c);
 
 	/* Optimize TCP settings */
 
@@ -447,7 +386,7 @@ begin:
 	if(result == -1) {
 		if(sockinprogress(sockerrno)) {
 			c->status.connecting = true;
-			return;
+			return true;
 		}
 
 		closesocket(c->socket);
@@ -459,14 +398,32 @@ begin:
 
 	finish_connecting(c);
 
-	return;
+	return true;
+}
+
+static void handle_meta_write(int sock, short events, void *data) {
+	ifdebug(META) logger(LOG_DEBUG, "handle_meta_write() called");
+
+	connection_t *c = data;
+
+	ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
+	if(outlen <= 0) {
+		logger(LOG_ERR, "Onoes, outlen = %d (%s)", (int)outlen, strerror(errno));
+		terminate_connection(c, c->status.active);
+		return;
+	}
+
+	buffer_read(&c->outbuf, outlen);
+	if(!c->outbuf.len && event_initialized(&c->outevent))
+		event_del(&c->outevent);
 }
 
 void setup_outgoing_connection(outgoing_t *outgoing) {
 	connection_t *c;
 	node_t *n;
 
-	outgoing->event = NULL;
+	if(event_initialized(&outgoing->ev))
+		event_del(&outgoing->ev);
 
 	n = lookup_node(outgoing->name);
 
@@ -497,28 +454,32 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 	}
 
 	c->outgoing = outgoing;
-	c->last_ping_time = now;
+	c->last_ping_time = time(NULL);
 
 	connection_add(c);
 
-	do_outgoing_connection(c);
+	if (do_outgoing_connection(c)) {
+		event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+		event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
+		event_add(&c->inevent, NULL);
+	}
 }
 
 /*
   accept a new tcp connect and create a
   new connection
 */
-bool handle_new_meta_connection(int sock) {
+void handle_new_meta_connection(int sock, short events, void *data) {
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
-	socklen_t len = sizeof(sa);
+	socklen_t len = sizeof sa;
 
 	fd = accept(sock, &sa.sa, &len);
 
 	if(fd < 0) {
 		logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
-		return false;
+		return;
 	}
 
 	sockaddrunmap(&sa);
@@ -533,18 +494,20 @@ bool handle_new_meta_connection(int sock) {
 	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->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+	event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
+	event_add(&c->inevent, NULL);
+		
 	configure_tcp(c);
 
 	connection_add(c);
 
 	c->allow_request = ID;
 	send_id(c);
-
-	return true;
 }
 
 static void free_outgoing(outgoing_t *outgoing) {
@@ -575,7 +538,7 @@ void try_outgoing_connections(void) {
 			continue;
 		}
 
-		outgoing = xmalloc_and_zero(sizeof(*outgoing));
+		outgoing = xmalloc_and_zero(sizeof *outgoing);
 		outgoing->name = name;
 		list_insert_tail(outgoing_list, outgoing);
 		setup_outgoing_connection(outgoing);