X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=ee18037be4cdf14ace6e99b213979445e330368e;hp=5cd3fa5efb4a81b72f1a816cbf313185faeb9219;hb=c08858baa91a00e38c0f5482dbb0817dbd0361f1;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/net.c b/src/net.c
index 5cd3fa5e..ee18037b 100644
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.180 2002/09/09 21:24:34 guus Exp $
+    $Id: net.c,v 1.35.4.183 2003/01/17 00:37:18 guus Exp $
 */
 
 #include "config.h"
@@ -25,16 +25,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -49,6 +39,16 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#include <netinet/in.h>
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
 
 #include <openssl/rand.h>
 
@@ -129,11 +129,11 @@ void purge(void)
   put all file descriptors in an fd_set array
   While we're at it, purge stuff that needs to be removed.
 */
-void build_fdset(fd_set * fs)
+int build_fdset(fd_set * fs)
 {
 	avl_node_t *node, *next;
 	connection_t *c;
-	int i;
+	int i, max = 0;
 
 	cp();
 
@@ -147,16 +147,27 @@ void build_fdset(fd_set * fs)
 			connection_del(c);
 			if(!connection_tree->head)
 				purge();
-		} else
+		} else {
 			FD_SET(c->socket, fs);
+			if(c->socket > max)
+				max = c->socket;
+		}
 	}
 
 	for(i = 0; i < listen_sockets; i++) {
 		FD_SET(listen_socket[i].tcp, fs);
+		if(listen_socket[i].tcp > max)
+			max = listen_socket[i].tcp;
 		FD_SET(listen_socket[i].udp, fs);
+		if(listen_socket[i].udp > max)
+			max = listen_socket[i].udp;
 	}
 
 	FD_SET(device_fd, fs);
+	if(device_fd > max)
+		max = device_fd;
+	
+	return max;
 }
 
 /*
@@ -166,7 +177,7 @@ void build_fdset(fd_set * fs)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t * c, int report)
+void terminate_connection(connection_t *c, int report)
 {
 	cp();
 
@@ -317,7 +328,7 @@ void main_loop(void)
 {
 	fd_set fset;
 	struct timeval tv;
-	int r;
+	int r, maxfd;
 	time_t last_ping_check;
 	event_t *event;
 
@@ -332,9 +343,9 @@ void main_loop(void)
 		tv.tv_sec = 1 + (rand() & 7);	/* Approx. 5 seconds, randomized to prevent global synchronisation effects */
 		tv.tv_usec = 0;
 
-		build_fdset(&fset);
+		maxfd = build_fdset(&fset);
 
-		r = select(FD_SETSIZE, &fset, NULL, NULL, &tv);
+		r = select(maxfd + 1, &fset, NULL, NULL, &tv);
 
 		if(r < 0) {
 			if(errno != EINTR && errno != EAGAIN) {