X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_socket.c;h=287d68887fde45ecaa6e4d9b4aa1b6beed054861;hb=760dd966efe7dbff316a8c638e40dee162848256;hp=c2a685965a362c1314308b4046e1fc8d16585f0e;hpb=64e0519cb5042b251e7345f07429e8b82e2ac09b;p=meshlink

diff --git a/src/net_socket.c b/src/net_socket.c
index c2a68596..287d6888 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -25,7 +25,6 @@
 #include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "event.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
@@ -62,6 +61,12 @@ static void configure_tcp(connection_t *c)
 	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
 		logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
 	}
+#elif defined(WIN32)
+	unsigned long arg = 1;
+
+	if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
+		logger(LOG_ERR, _("ioctlsocket for %s: WSA error %d"), c->hostname, WSAGetLastError());
+	}
 #endif
 
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
@@ -160,6 +165,16 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 			return -1;
 		}
 	}
+#elif defined(WIN32)
+	{
+		unsigned long arg = 1;
+		if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
+			closesocket(nfd);
+			logger(LOG_ERR, _("Call to `%s' failed: WSA error %d"), "ioctlsocket",
+				WSAGetLastError());
+			return -1;
+		}
+	}
 #endif
 
 	option = 1;
@@ -218,10 +233,11 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 	return nfd;
 }
 
-void retry_outgoing(outgoing_t *outgoing)
-{
-	event_t *event;
+static void retry_outgoing_handler(int fd, short events, void *data) {
+	do_outgoing_connection(data);
+}
 
+void retry_outgoing(outgoing_t *outgoing) {
 	cp();
 
 	outgoing->timeout += 5;
@@ -229,11 +245,8 @@ void retry_outgoing(outgoing_t *outgoing)
 	if(outgoing->timeout > maxtimeout)
 		outgoing->timeout = maxtimeout;
 
-	event = new_event();
-	event->handler = (event_handler_t) setup_outgoing_connection;
-	event->time = now + outgoing->timeout;
-	event->data = outgoing;
-	event_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"),
@@ -248,7 +261,8 @@ 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);
 }
@@ -318,7 +332,11 @@ begin:
 	result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
 
 	if(result == -1) {
-		if(errno == EINPROGRESS) {
+		if(errno == EINPROGRESS
+#if defined(WIN32) && !defined(O_NONBLOCK)
+		   || WSAGetLastError() == WSAEWOULDBLOCK
+#endif
+		) {
 			c->status.connecting = true;
 			return;
 		}
@@ -373,18 +391,25 @@ 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);
+
+	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_EMERG, _("event_add failed: %s"), strerror(errno));
+		abort();
+	}
 }
 
 /*
   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;
@@ -396,15 +421,14 @@ bool handle_new_meta_connection(int sock)
 	fd = accept(sock, &sa.sa, &len);
 
 	if(fd < 0) {
-		logger(LOG_ERR, _("Accepting a new connection failed: %s"),
-			   strerror(errno));
-		return false;
+		logger(LOG_ERR, _("Accepting a new connection failed: %s"), strerror(errno));
+		return;
 	}
 
 	sockaddrunmap(&sa);
 
 	c = new_connection();
-	c->name = NULL;
+	c->name = xstrdup("<unknown>");
 	c->outcipher = myself->connection->outcipher;
 	c->outdigest = myself->connection->outdigest;
 	c->outmaclength = myself->connection->outmaclength;
@@ -413,18 +437,24 @@ 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->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;
+	}
+		
 	configure_tcp(c);
 
 	connection_add(c);
 
 	c->allow_request = ID;
 	send_id(c);
-
-	return true;
 }
 
 void try_outgoing_connections(void)