X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=5111ec25d2773635752896db8f1094ba124d78d4;hb=4856d8e1f8398780a49545f35ba9b5746c9fc060;hp=cc799264b4d5d6bd55977db6c0ab8723eaaa6371;hpb=0c16add71c6432c882c6d8f538a4b2db0026ec24;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index cc799264..5111ec25 100644
--- a/src/net_socket.c
+++ b/src/net_socket.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_socket.c,v 1.1.2.8 2002/03/01 15:14:29 guus Exp $
+    $Id: net_socket.c,v 1.1.2.12 2002/04/18 20:09:05 zarq Exp $
 */
 
 #include "config.h"
@@ -66,12 +66,15 @@
 
 #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];
+listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets = 0;
 
 /* Setup sockets */
@@ -287,7 +290,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;
         }
@@ -438,6 +440,8 @@ cp
       return -1;
     }
 
+  sockaddrunmap(&sa);
+
   c = new_connection();
   c->outcipher = myself->connection->outcipher;
   c->outdigest = myself->connection->outdigest;