Update copyright notices, remove Ivo's email address.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index ab2d79d..4b94f33 100644 (file)
--- 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-2006 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
@@ -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,10 @@ 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));
        }
 #endif
 
@@ -394,7 +391,8 @@ bool handle_new_meta_connection(int sock)
        int option;
        connection_t *c;
        sockaddr_t sa;
-       int fd, len = sizeof(sa);
+       int fd;
+       socklen_t len = sizeof(sa);
 
        cp();