check_rsa() is broken, I don't know why, just remove it for now.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 9393954..b5dc727 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.4 2002/02/20 22:15:32 guus Exp $
+    $Id: net_setup.c,v 1.1.2.14 2002/04/01 21:28:39 guus Exp $
 */
 
 #include "config.h"
@@ -184,34 +184,6 @@ cp
   return -1;
 }
 
-int check_rsa_key(RSA *rsa_key)
-{
-  char *test1, *test2, *test3;
-cp
-  if(rsa_key->p && rsa_key->q)
-    {
-      if(RSA_check_key(rsa_key) != 1)
-          return -1;
-    }
-  else
-    {
-      test1 = xmalloc(RSA_size(rsa_key));
-      test2 = xmalloc(RSA_size(rsa_key));
-      test3 = xmalloc(RSA_size(rsa_key));
-
-      if(RSA_public_encrypt(RSA_size(rsa_key), test1, test2, rsa_key, RSA_NO_PADDING) != RSA_size(rsa_key))
-          return -1;
-
-      if(RSA_private_decrypt(RSA_size(rsa_key), test2, test3, rsa_key, RSA_NO_PADDING) != RSA_size(rsa_key))
-          return -1;
-
-      if(memcmp(test1, test3, RSA_size(rsa_key)))
-          return -1;
-    }
-cp
-  return 0;
-}
-
 /*
   Configure node_t myself and set up the local sockets (listen only)
 */
@@ -219,8 +191,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();
@@ -263,12 +235,6 @@ cp
     return -1;
 cp
 
-  if(check_rsa_key(myself->connection->rsa_key))
-    {
-      syslog(LOG_ERR, _("Invalid public/private keypair!"));
-      return -1;
-    }
-
   if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
     asprintf(&myport, "655");
 
@@ -326,6 +292,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 +365,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 +430,7 @@ cp
   myself->nexthop = myself;
   myself->via = myself;
   myself->status.active = 1;
+  myself->status.reachable = 1;
   node_add(myself);
 
   graph();
@@ -475,32 +451,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,11 +489,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))
     {
@@ -548,22 +529,27 @@ 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_requests();
   exit_events();
   exit_edges();
   exit_subnets();