X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=f4c9e534900ac1c6059d7223fa6fbcc54a9f1569;hp=9393954072c1868a0e81a124640bf900fde88e1b;hb=305505f5ec4bb738f175cd897fa409f08d2971a3;hpb=dbc5b5bb5eb3096ad930aa6b590deaba2a103dfc;ds=sidebyside

diff --git a/src/net_setup.c b/src/net_setup.c
index 93939540..f4c9e534 100644
--- 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.4 2002/02/20 22:15:32 guus Exp $
+    $Id: net_setup.c,v 1.1.2.11 2002/03/18 22:47:20 guus Exp $
 */
 
 #include "config.h"
@@ -219,8 +219,8 @@ int setup_myself(void)
 {
   config_t *cfg;
   subnet_t *subnet;
-  char *name, *mode, *afname, *cipher, *digest;
-  struct addrinfo hint, *ai;
+  char *name, *hostname, *mode, *afname, *cipher, *digest;
+  struct addrinfo hint, *ai, *aip;
   int choice, err;
 cp
   myself = new_node();
@@ -326,6 +326,15 @@ cp
   else
     routing_mode = RMODE_ROUTER;
 
+  get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+#if !defined(SOL_IP) || !defined(IP_TOS)
+  if(priorityinheritance)
+    syslog(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
+#endif
+
+  if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
+    macexpire= 600;
+
   if(get_config_int(lookup_config(myself->connection->config_tree, "MaxTimeout"), &maxtimeout))
     {
       if(maxtimeout <= 0)
@@ -390,7 +399,7 @@ cp
   if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
     keylifetime = 3600;
 
-  keyexpires = time(NULL) + keylifetime;
+  keyexpires = now + keylifetime;
 
   /* Check if we want to use message authentication codes... */
 
@@ -475,32 +484,34 @@ cp
       return -1;
     }
 
-  if((tcp_socket = setup_listen_socket((sockaddr_t *)ai->ai_addr)) < 0)
+  for(aip = ai; aip; aip = aip->ai_next)
     {
-      syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
-      return -1;
-    }
+      if((listen_socket[listen_sockets].tcp = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0)
+        continue;
 
-  freeaddrinfo(ai);
+      if((listen_socket[listen_sockets].udp = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0)
+        continue;
 
-  hint.ai_socktype = SOCK_DGRAM;
-  hint.ai_protocol = IPPROTO_UDP;
+      if(debug_lvl >= DEBUG_CONNECTIONS)
+        {
+	  hostname = sockaddr2hostname((sockaddr_t *)aip->ai_addr);
+	  syslog(LOG_NOTICE, _("Listening on %s"), hostname);
+	  free(hostname);
+	}
 
-  if((err = getaddrinfo(NULL, myport, &hint, &ai)) || !ai)
-    {
-      syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
-      return -1;
+      listen_socket[listen_sockets].sa.sa = *aip->ai_addr;
+      listen_sockets++;
     }
 
-  if((udp_socket = setup_vpn_in_socket((sockaddr_t *)ai->ai_addr)) < 0)
+  freeaddrinfo(ai);
+
+  if(listen_sockets)
+    syslog(LOG_NOTICE, _("Ready"));
+  else
     {
-      syslog(LOG_ERR, _("Unable to set up a listening UDP socket!"));
+      syslog(LOG_ERR, _("Unable to create any listening socket!"));
       return -1;
     }
-
-  freeaddrinfo(ai);
-
-  syslog(LOG_NOTICE, _("Ready: listening on port %s"), myport);
 cp
   return 0;
 }
@@ -511,6 +522,8 @@ cp
 int setup_network_connections(void)
 {
 cp
+  now = time(NULL);
+
   init_connections();
   init_subnets();
   init_nodes();
@@ -548,21 +561,25 @@ void close_network_connections(void)
 {
   avl_node_t *node, *next;
   connection_t *c;
+  int i;
 cp
   for(node = connection_tree->head; node; node = next)
     {
       next = node->next;
       c = (connection_t *)node->data;
       if(c->outgoing)
-        free(c->outgoing->name), free(c->outgoing);
+        free(c->outgoing->name), free(c->outgoing), c->outgoing = NULL;
       terminate_connection(c, 0);
     }
 
   if(myself && myself->connection)
     terminate_connection(myself->connection, 0);
 
-  close(udp_socket);
-  close(tcp_socket);
+  for(i = 0; i < listen_sockets; i++)
+    {
+      close(listen_socket[i].tcp);
+      close(listen_socket[i].udp);
+    }
 
   exit_events();
   exit_edges();