Drop graph and edge stuff. Use new node stuff instead.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 5111ec2..e0cec2c 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-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2002 Guus Sliepen <guus@sliepen.eu.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
@@ -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_socket.c,v 1.1.2.12 2002/04/18 20:09:05 zarq Exp $
+    $Id: net_socket.c,v 1.1.2.17 2002/09/03 20:43:25 guus Exp $
 */
 
 #include "config.h"
@@ -26,8 +26,13 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#ifdef HAVE_LINUX
+#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>
@@ -58,7 +63,6 @@
 #include "process.h"
 #include "protocol.h"
 #include "subnet.h"
-#include "graph.h"
 #include "process.h"
 #include "route.h"
 #include "device.h"
@@ -75,7 +79,7 @@ int maxtimeout = 900;
 int seconds_till_retry = 5;
 
 listen_socket_t listen_socket[MAXSOCKETS];
-int listen_sockets = 0;
+int listen_sockets;
 
 /* Setup sockets */
 
@@ -142,7 +146,7 @@ cp
       return -1;
     }
 
-  if(listen(nfd, 3))
+  if(listen(nfd, 0))
     {
       close(nfd);
       syslog(LOG_ERR, _("System call `%s' failed: %s"), "listen", strerror(errno));
@@ -241,10 +245,12 @@ cp
 
   /* Optimize TCP settings */
 
-#ifdef HAVE_LINUX
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
   option = 1;
   setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+#endif
 
+#if defined(SOL_IP) && defined(IP_TOS)
   option = IPTOS_LOWDELAY;
   setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
 #endif
@@ -337,10 +343,12 @@ begin:
 
   /* Optimize TCP settings */
 
-#ifdef HAVE_LINUX
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
   option = 1;
   setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+#endif
 
+#if defined(SOL_IP) && defined(IP_TOS)
   option = IPTOS_LOWDELAY;
   setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
 #endif