X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=0281d655875e5afd089f9278d44d8f2282712602;hp=63760afb5e74b8ac454e0da1c6edc02645b09833;hb=82ebfc923ddb050c88bdf5d65ac943a15ca8748a;hpb=14979f835df4214a7c2510852f7ffedc9e08c2c0

diff --git a/src/net_socket.c b/src/net_socket.c
index 63760afb..0281d655 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-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.7 2002/03/01 14:09:31 guus Exp $
+    $Id: net_socket.c,v 1.1.2.18 2002/09/04 13:48:52 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>
@@ -66,13 +71,16 @@
 
 #include "system.h"
 
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
+#endif
+
 int addressfamily = AF_INET;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
 
-int tcp_socket[MAXSOCKETS];
-int udp_socket[MAXSOCKETS];
-int listen_sockets = 0;
+listen_socket_t listen_socket[MAXSOCKETS];
+int listen_sockets;
 
 /* Setup sockets */
 
@@ -81,7 +89,7 @@ int setup_listen_socket(sockaddr_t *sa)
   int nfd, flags;
   char *addrstr;
   int option;
-#ifdef HAVE_LINUX
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
   char *interface;
   struct ifreq ifr;
 #endif
@@ -104,14 +112,19 @@ cp
 
   option = 1;
   setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
-#ifdef HAVE_LINUX
+
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
   setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+#endif
 
+#if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
   option = IPTOS_LOWDELAY;
   setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
+#endif
 
   if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
     {
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
       memset(&ifr, 0, sizeof(ifr));
       strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
       if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)))
@@ -120,8 +133,10 @@ cp
           syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
           return -1;
 	}
-    }
+#else
+      syslog(LOG_WARNING, _("BindToDevice not supported on this platform"));
 #endif
+    }
 
   if(bind(nfd, &sa->sa, SALEN(sa->sa)))
     {
@@ -147,7 +162,7 @@ int setup_vpn_in_socket(sockaddr_t *sa)
   int nfd, flags;
   char *addrstr;
   int option;
-#ifdef HAVE_LINUX
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
   char *interface;
   struct ifreq ifr;
 #endif
@@ -168,7 +183,8 @@ cp
 
   option = 1;
   setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
-#ifdef HAVE_LINUX
+
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
   if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
     {
       memset(&ifr, 0, sizeof(ifr));
@@ -230,10 +246,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
@@ -279,7 +297,6 @@ begin:
           if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_ERR, _("Could not set up a meta connection to %s"), c->name);
           c->status.remove = 1;
-	  do_prune = 1;
 	  retry_outgoing(c->outgoing);
 	  return;
         }
@@ -327,10 +344,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
@@ -430,6 +449,8 @@ cp
       return -1;
     }
 
+  sockaddrunmap(&sa);
+
   c = new_connection();
   c->outcipher = myself->connection->outcipher;
   c->outdigest = myself->connection->outdigest;