Fix listening sockets.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 1c5ff15..6278f5d 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.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_setup.c,v 1.1.2.1 2002/02/18 16:25:16 guus Exp $
+    $Id: net_setup.c,v 1.1.2.6 2002/03/01 12:25:58 guus Exp $
 */
 
 #include "config.h"
@@ -219,9 +219,9 @@ int setup_myself(void)
 {
   config_t *cfg;
   subnet_t *subnet;
-  char *name, *mode, *afname, *cipher, *digest;
-  struct addrinfo hint, *ai;
-  int choice;
+  char *name, *hostname, *mode, *afname, *cipher, *digest;
+  struct addrinfo hint, *ai, *aip;
+  int choice, err, sock;
 cp
   myself = new_node();
   myself->connection = new_connection();
@@ -326,6 +326,8 @@ cp
   else
     routing_mode = RMODE_ROUTER;
 
+  get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+
   if(get_config_int(lookup_config(myself->connection->config_tree, "MaxTimeout"), &maxtimeout))
     {
       if(maxtimeout <= 0)
@@ -382,6 +384,8 @@ cp
   else
     myself->keylength = 1;
 
+  myself->connection->outcipher = EVP_bf_ofb();
+
   myself->key = (char *)xmalloc(myself->keylength);
   RAND_pseudo_bytes(myself->key, myself->keylength);
 
@@ -410,6 +414,8 @@ cp
   else
     myself->digest = EVP_sha1();
 
+  myself->connection->outdigest = EVP_sha1();
+
   if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->maclength))
     {
       if(myself->digest)
@@ -429,6 +435,8 @@ cp
   else
     myself->maclength = 4;
 
+  myself->connection->outmaclength = 0;
+
   /* Compression */
 
   if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->compression))
@@ -441,6 +449,8 @@ cp
     }
   else
     myself->compression = 0;
+
+  myself->connection->outcompression = 0;
 cp
   /* Done */
 
@@ -454,32 +464,65 @@ cp
 cp
   /* Open sockets */
   
-  hint.ai_family = (addressfamily == AF_UNSPEC)?AF_INET6:addressfamily;
+  memset(&hint, 0, sizeof(hint));
+  
+  hint.ai_family = addressfamily;
   hint.ai_socktype = SOCK_STREAM;
   hint.ai_protocol = IPPROTO_TCP;
   hint.ai_flags = AI_PASSIVE;
 
-  if(getaddrinfo(NULL, myport, &hint, &ai) || !ai)
+  if((err = getaddrinfo(NULL, myport, &hint, &ai)) || !ai)
     {
-      syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", strerror(errno));
+      syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
       return -1;
     }
 
-  if((tcp_socket = setup_listen_socket((sockaddr_t *)ai->ai_addr)) < 0)
+  tcp_sockets = 0;
+
+  for(aip = ai; aip; aip = aip->ai_next)
     {
-      syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
-      return -1;
+      if((sock = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0)
+        continue;
+
+      tcp_socket[tcp_sockets++] = sock;
+      if(debug_lvl >= DEBUG_CONNECTIONS)
+        {
+         hostname = sockaddr2hostname((sockaddr_t *)aip->ai_addr);
+         syslog(LOG_NOTICE, _("Listening on %s/tcp"), hostname);
+         free(hostname);
+       }
     }
 
-  if((udp_socket = setup_vpn_in_socket((sockaddr_t *)ai->ai_addr)) < 0)
+  freeaddrinfo(ai);
+
+  hint.ai_socktype = SOCK_DGRAM;
+  hint.ai_protocol = IPPROTO_UDP;
+
+  if((err = getaddrinfo(NULL, myport, &hint, &ai)) || !ai)
     {
-      syslog(LOG_ERR, _("Unable to set up a listening UDP socket!"));
+      syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
       return -1;
     }
 
+  udp_sockets = 0;
+
+  for(aip = ai; aip; aip = aip->ai_next)
+    {
+      if((sock = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0)
+        continue;
+
+      udp_socket[udp_sockets++] = sock;
+      if(debug_lvl >= DEBUG_CONNECTIONS)
+        {
+         hostname = sockaddr2hostname((sockaddr_t *)aip->ai_addr);
+         syslog(LOG_NOTICE, _("Listening on %s/udp"), hostname);
+         free(hostname);
+       }
+    }
+
   freeaddrinfo(ai);
 
-  syslog(LOG_NOTICE, _("Ready: listening on port %s"), myport);
+  syslog(LOG_NOTICE, _("Ready"));
 cp
   return 0;
 }
@@ -527,6 +570,7 @@ void close_network_connections(void)
 {
   avl_node_t *node, *next;
   connection_t *c;
+  int i;
 cp
   for(node = connection_tree->head; node; node = next)
     {
@@ -540,8 +584,10 @@ cp
   if(myself && myself->connection)
     terminate_connection(myself->connection, 0);
 
-  close(udp_socket);
-  close(tcp_socket);
+  for(i = 0; i < udp_sockets; i++)
+    close(udp_socket[i]);
+  for(i = 0; i < tcp_sockets; i++)
+    close(tcp_socket[i]);
 
   exit_events();
   exit_edges();