Set myself->status.reachable.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index a985b55..cd2b7ea 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.5 2002/02/26 23:26:41 guus Exp $
+    $Id: net_setup.c,v 1.1.2.13 2002/03/25 13:54:49 guus Exp $
 */
 
 #include "config.h"
@@ -221,7 +221,7 @@ int setup_myself(void)
   subnet_t *subnet;
   char *name, *hostname, *mode, *afname, *cipher, *digest;
   struct addrinfo hint, *ai, *aip;
-  int choice, err, sock;
+  int choice, err;
 cp
   myself = new_node();
   myself->connection = new_connection();
@@ -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... */
 
@@ -455,6 +464,7 @@ cp
   myself->nexthop = myself;
   myself->via = myself;
   myself->status.active = 1;
+  myself->status.reachable = 1;
   node_add(myself);
 
   graph();
@@ -475,52 +485,34 @@ cp
       return -1;
     }
 
-  tcp_sockets = 0;
-
   for(aip = ai; aip; aip = aip->ai_next)
     {
-      if((sock = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0)
+      if((listen_socket[listen_sockets].tcp = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0)
+        continue;
+
+      if((listen_socket[listen_sockets].udp = setup_vpn_in_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);
+         syslog(LOG_NOTICE, _("Listening on %s"), hostname);
          free(hostname);
        }
+
+      listen_socket[listen_sockets].sa.sa = *aip->ai_addr;
+      listen_sockets++;
     }
 
   freeaddrinfo(ai);
 
-  hint.ai_socktype = SOCK_DGRAM;
-  hint.ai_protocol = IPPROTO_UDP;
-
-  if((err = getaddrinfo(NULL, myport, &hint, &ai)) || !ai)
+  if(listen_sockets)
+    syslog(LOG_NOTICE, _("Ready"));
+  else
     {
-      syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
+      syslog(LOG_ERR, _("Unable to create any listening socket!"));
       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"));
 cp
   return 0;
 }
@@ -531,11 +523,14 @@ cp
 int setup_network_connections(void)
 {
 cp
+  now = time(NULL);
+
   init_connections();
   init_subnets();
   init_nodes();
   init_edges();
   init_events();
+  init_requests();
 
   if(get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
     {
@@ -575,18 +570,20 @@ cp
       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);
 
-  for(i = 0; i < udp_sockets; i++)
-    close(udp_socket[i]);
-  for(i = 0; i < tcp_sockets; i++)
-    close(tcp_socket[i]);
+  for(i = 0; i < listen_sockets; i++)
+    {
+      close(listen_socket[i].tcp);
+      close(listen_socket[i].udp);
+    }
 
+  exit_requests();
   exit_events();
   exit_edges();
   exit_subnets();