X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=757199d6574657de17646b1fe9ccc2e662944f0e;hp=93314fb6c5941a4d2e06cc4aec1748d229fafdad;hb=50403909b6bf6536924d4693bb1f32c248f17fda;hpb=c2b9c06062d36bde859b630b99a08c7b7428e721

diff --git a/src/net_socket.c b/src/net_socket.c
index 93314fb6..757199d6 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.1 2002/02/18 16:25:16 guus Exp $
+    $Id: net_socket.c,v 1.1.2.4 2002/02/26 23:26:41 guus Exp $
 */
 
 #include "config.h"
@@ -70,8 +70,11 @@ int addressfamily = AF_INET;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
 
-int tcp_socket = -1;
-int udp_socket = -1;
+int tcp_socket[MAXSOCKETS];
+int udp_socket[MAXSOCKETS];
+int tcp_sockets = 0;
+int udp_sockets = 0;
+
 /* Setup sockets */
 
 int setup_listen_socket(sockaddr_t *sa)
@@ -116,7 +119,7 @@ cp
       }
 #endif
 
-  if(bind(nfd, &sa->sa, sizeof(*sa)))
+  if(bind(nfd, &sa->sa, SALEN(sa->sa)))
     {
       close(nfd);
       addrstr = sockaddr2hostname(sa);
@@ -170,7 +173,7 @@ cp
       }
 #endif
 
-  if(bind(nfd, &sa->sa, sizeof(*sa)))
+  if(bind(nfd, &sa->sa, SALEN(sa->sa)))
     {
       close(nfd);
       addrstr = sockaddr2hostname(sa);
@@ -228,10 +231,10 @@ cp
 
   /* Connect */
 
-  if(connect(c->socket, &c->address.sa, sizeof(c->address)) == -1)
+  if(connect(c->socket, &c->address.sa, SALEN(c->address.sa)) == -1)
     {
       close(c->socket);
-      syslog(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
+      syslog(LOG_ERR, _("Error while connecting to %s (%s): %s"), c->name, c->hostname, strerror(errno));
       return -1;
     }
 
@@ -334,7 +337,7 @@ begin:
 
   /* Connect */
 
-  result = connect(c->socket, &c->address.sa, sizeof(c->address));
+  result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
 
   if(result == -1)
     {
@@ -375,6 +378,10 @@ cp
 
   c = new_connection();
   c->name = xstrdup(outgoing->name);
+  c->outcipher = myself->connection->outcipher;
+  c->outdigest = myself->connection->outdigest;
+  c->outmaclength = myself->connection->outmaclength;
+  c->outcompression = myself->connection->outcompression;
 
   init_configuration(&c->config_tree);
   read_connection_config(c);
@@ -402,19 +409,23 @@ cp
   accept a new tcp connect and create a
   new connection
 */
-int handle_new_meta_connection()
+int handle_new_meta_connection(int sock)
 {
   connection_t *c;
   sockaddr_t sa;
   int fd, len = sizeof(sa);
 cp
-  if((fd = accept(tcp_socket, &sa.sa, &len)) < 0)
+  if((fd = accept(sock, &sa.sa, &len)) < 0)
     {
       syslog(LOG_ERR, _("Accepting a new connection failed: %s"), strerror(errno));
       return -1;
     }
 
   c = new_connection();
+  c->outcipher = myself->connection->outcipher;
+  c->outdigest = myself->connection->outdigest;
+  c->outmaclength = myself->connection->outmaclength;
+  c->outcompression = myself->connection->outcompression;
 
   c->address = sa;
   c->hostname = sockaddr2hostname(&sa);