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

diff --git a/src/net_socket.c b/src/net_socket.c
index ab2d79d2..7fe80b2b 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 <ivo@tinc-vpn.org>,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans,
+                  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,7 @@
 #include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "event.h"
+#include "tevent.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"
@@ -46,7 +46,6 @@
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
-bool blockingtcp = false;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
@@ -58,12 +57,16 @@ static void configure_tcp(connection_t *c)
 	int option;
 
 #ifdef O_NONBLOCK
-	if(!blockingtcp) {
-		int flags = fcntl(c->socket, F_GETFL);
+	int flags = fcntl(c->socket, F_GETFL);
 
-		if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
-			logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
-		}
+	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
 
@@ -163,6 +166,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;
@@ -223,7 +236,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 
 void retry_outgoing(outgoing_t *outgoing)
 {
-	event_t *event;
+	tevent_t *event;
 
 	cp();
 
@@ -232,11 +245,11 @@ void retry_outgoing(outgoing_t *outgoing)
 	if(outgoing->timeout > maxtimeout)
 		outgoing->timeout = maxtimeout;
 
-	event = new_event();
+	event = new_tevent();
 	event->handler = (event_handler_t) setup_outgoing_connection;
 	event->time = now + outgoing->timeout;
 	event->data = outgoing;
-	event_add(event);
+	tevent_add(event);
 
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE,
 			   _("Trying to re-establish outgoing connection in %d seconds"),
@@ -245,8 +258,6 @@ void retry_outgoing(outgoing_t *outgoing)
 
 void finish_connecting(connection_t *c)
 {
-	int option;
-
 	cp();
 
 	ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
@@ -261,7 +272,7 @@ void finish_connecting(connection_t *c)
 void do_outgoing_connection(connection_t *c)
 {
 	char *address, *port;
-	int option, result, flags;
+	int result;
 
 	cp();
 
@@ -323,7 +334,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;
 		}
@@ -380,6 +395,14 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 	c->outgoing = outgoing;
 	c->last_ping_time = now;
 
+	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);
@@ -389,27 +412,26 @@ void setup_outgoing_connection(outgoing_t *outgoing)
   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)
 {
-	int option;
 	connection_t *c;
 	sockaddr_t sa;
-	int fd, len = sizeof(sa);
+	int fd;
+	socklen_t len = sizeof(sa);
 
 	cp();
 
 	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;
@@ -422,14 +444,20 @@ bool handle_new_meta_connection(int sock)
 
 	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)