X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=b472f16e0053b2ac861c205fa4828213d137a2f4;hp=a77fa58ae12733e98664481bf7702a06330c4e3c;hb=b6ad4ce35a4434c209ee26015f15a18180987bac;hpb=5ffeb13d65313d5a191a605690a4f8fdf1604b48

diff --git a/src/net_setup.c b/src/net_setup.c
index a77fa58a..b472f16e 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.10 2002/03/10 16:09:15 guus Exp $
+    $Id: net_setup.c,v 1.1.2.15 2002/04/23 07:49:38 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)
 */
@@ -220,6 +192,7 @@ int setup_myself(void)
   config_t *cfg;
   subnet_t *subnet;
   char *name, *hostname, *mode, *afname, *cipher, *digest;
+  char *address = NULL;
   struct addrinfo hint, *ai, *aip;
   int choice, err;
 cp
@@ -263,12 +236,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");
 
@@ -464,6 +431,7 @@ cp
   myself->nexthop = myself;
   myself->via = myself;
   myself->status.active = 1;
+  myself->status.reachable = 1;
   node_add(myself);
 
   graph();
@@ -473,12 +441,14 @@ cp
   
   memset(&hint, 0, sizeof(hint));
   
+  get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
+
   hint.ai_family = addressfamily;
   hint.ai_socktype = SOCK_STREAM;
   hint.ai_protocol = IPPROTO_TCP;
   hint.ai_flags = AI_PASSIVE;
 
-  if((err = getaddrinfo(NULL, myport, &hint, &ai)) || !ai)
+  if((err = getaddrinfo(address, myport, &hint, &ai)) || !ai)
     {
       syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
       return -1;
@@ -486,10 +456,10 @@ cp
 
   for(aip = ai; aip; aip = aip->ai_next)
     {
-      if((tcp_socket[listen_sockets] = 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((udp_socket[listen_sockets] = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0)
+      if((listen_socket[listen_sockets].udp = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0)
         continue;
 
       if(debug_lvl >= DEBUG_CONNECTIONS)
@@ -499,6 +469,7 @@ cp
 	  free(hostname);
 	}
 
+      listen_socket[listen_sockets].sa.sa = *aip->ai_addr;
       listen_sockets++;
     }
 
@@ -528,6 +499,7 @@ cp
   init_nodes();
   init_edges();
   init_events();
+  init_requests();
 
   if(get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
     {
@@ -576,10 +548,11 @@ cp
 
   for(i = 0; i < listen_sockets; i++)
     {
-      close(udp_socket[i]);
-      close(tcp_socket[i]);
+      close(listen_socket[i].tcp);
+      close(listen_socket[i].udp);
     }
 
+  exit_requests();
   exit_events();
   exit_edges();
   exit_subnets();