X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=81318e3e446575faf058398dc8745f47f95c7eee;hp=c57fc198e2a892f44ae0daed38acd1e65f3bf702;hb=9f64499e40a95a8c05c82924219517aa017fc411;hpb=baeac83bf465a47d46082e1de40ea14dcf1d39af

diff --git a/src/net.c b/src/net.c
index c57fc198..81318e3e 100644
--- a/src/net.c
+++ b/src/net.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.c,v 1.35.4.38 2000/10/15 20:30:39 guus Exp $
+    $Id: net.c,v 1.35.4.41 2000/10/20 15:34:35 guus Exp $
 */
 
 #include "config.h"
@@ -55,7 +55,7 @@
 #include "system.h"
 
 int tap_fd = -1;
-
+int taptype = 0;
 int total_tap_in = 0;
 int total_tap_out = 0;
 int total_socket_in = 0;
@@ -355,17 +355,20 @@ cp
 cp
   tap_fd = nfd;
 
+  taptype = 0;
+
 #ifdef HAVE_TUNTAP
   /* Ok now check if this is an old ethertap or a new tun/tap thingie */
   memset(&ifr, 0, sizeof(ifr));
 cp
-  ifr.ifr_flags = IFF_TAP;
+  ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
   if (netname)
     strncpy(ifr.ifr_name, netname, IFNAMSIZ);
 cp
   if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr))
   { 
     syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname);
+    taptype = 1;
     if((cfg = get_config_val(config, tapsubnet)) == NULL)
       syslog(LOG_INFO, _("tun/tap device will be left unconfigured"));
     else
@@ -535,6 +538,8 @@ cp
   if(debug_lvl > 0)
     syslog(LOG_INFO, _("Connected to %s port %hd"),
          cl->hostname, cl->port);
+
+  cl->status.meta = 1;
 cp
   return 0;
 }
@@ -546,18 +551,42 @@ cp
   an authentication sequence during which
   we will do just that.
 */
-int setup_outgoing_connection(char *hostname)
+int setup_outgoing_connection(char *name)
 {
   conn_list_t *ncn;
   struct hostent *h;
+  config_t *cfg;
 cp
-  if(!(h = gethostbyname(hostname)))
+  if(check_id(name))
     {
-      syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+      syslog(LOG_ERR, _("Invalid name for outgoing connection"));
       return -1;
     }
 
   ncn = new_conn_list();
+  asprintf(&ncn->name, "%s", name);
+    
+  if(read_host_config(ncn))
+    {
+      syslog(LOG_ERR, _("Error reading host configuration file for %s"));
+      free_conn_list(ncn);
+      return -1;
+    }
+    
+  if(!(cfg = get_config_val(ncn->config, address)))
+    {
+      syslog(LOG_ERR, _("No address specified for %s"));
+      free_conn_list(ncn);
+      return -1;
+    }
+    
+  if(!(h = gethostbyname(cfg->data.ptr)))
+    {
+      syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
+      free_conn_list(ncn);
+      return -1;
+    }
+
   ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
   ncn->hostname = hostlookup(htonl(ncn->address));
   
@@ -569,10 +598,15 @@ cp
       return -1;
     }
 
-  ncn->status.meta = 1;
   ncn->status.outgoing = 1;
-  ncn->next = conn_list;
-  conn_list = ncn;
+  ncn->buffer = xmalloc(MAXBUFSIZE);
+  ncn->buflen = 0;
+  ncn->last_ping_time = time(NULL);
+  ncn->want_ping = 0;
+
+  conn_list_add(ncn);
+
+  send_id(ncn);
 cp
   return 0;
 }
@@ -596,20 +630,48 @@ cp
       return -1;
     }
   else
-    myself->name = (char*)cfg->data.val;
+    asprintf(&myself->name, "%s", (char*)cfg->data.val);
 
   if(check_id(myself->name))
     {
       syslog(LOG_ERR, _("Invalid name for myself!"));
       return -1;
     }
+cp
+  if(!(cfg = get_config_val(config, privatekey)))
+    {
+      syslog(LOG_ERR, _("Private key for tinc daemon required!"));
+      return -1;
+    }
+  else
+    {
+      myself->rsa_key = RSA_new();
+      BN_hex2bn(&myself->rsa_key->d, cfg->data.ptr);
+      BN_hex2bn(&myself->rsa_key->e, "FFFF");
+    }
 
   if(read_host_config(myself))
     {
       syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
       return -1;
     }
-  
+cp  
+  if(!(cfg = get_config_val(myself->config, publickey)))
+    {
+      syslog(LOG_ERR, _("Public key for tinc daemon required!"));
+      return -1;
+    }
+  else
+    {
+      BN_hex2bn(&myself->rsa_key->n, cfg->data.ptr);
+    }
+/*
+  if(RSA_check_key(myself->rsa_key) != 1)
+    {
+      syslog(LOG_ERR, _("Invalid public/private keypair!"));
+      return -1;
+    }
+*/
   if(!(cfg = get_config_val(myself->config, port)))
     myself->port = 655;
   else
@@ -648,9 +710,12 @@ sigalrm_handler(int a)
 {
   config_t const *cfg;
 cp
-/* FIXME! Use name instead of upstreamip.
-  cfg = get_next_config_val(config, upstreamip, upstreamindex++);
-*/
+  cfg = get_next_config_val(config, connectto, upstreamindex++);
+
+  if(!upstreamindex && !cfg)
+    /* No upstream IP given, we're listen only. */
+    return;
+
   while(cfg)
     {
       if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
@@ -658,7 +723,7 @@ cp
           signal(SIGALRM, SIG_IGN);
           return;
         }
-//      cfg = get_next_config_val(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+      cfg = get_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
 
   signal(SIGALRM, sigalrm_handler);
@@ -690,7 +755,7 @@ cp
   if(setup_myself() < 0)
     return -1;
 
-//  if((cfg = get_next_config_val(config, upstreamip, upstreamindex++)) == NULL)
+  if((cfg = get_next_config_val(config, connectto, upstreamindex++)) == NULL)
     /* No upstream IP given, we're listen only. */
     return 0;
 
@@ -698,7 +763,7 @@ cp
     {
       if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
         return 0;
-//      cfg = get_next_config_val(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+      cfg = get_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
     
   signal(SIGALRM, sigalrm_handler);
@@ -822,11 +887,7 @@ cp
     syslog(LOG_NOTICE, _("Connection from %s port %d"),
          p->hostname, htons(ci.sin_port));
 
-  if(send_id(p) < 0)
-    {
-      free_conn_list(p);
-      return NULL;
-    }
+  p->allow_request = ID;
 cp
   return p;
 }
@@ -1081,10 +1142,24 @@ void handle_tap_input(void)
   int ether_type, lenin;
 cp  
   memset(&vp, 0, sizeof(vp));
-  if((lenin = read(tap_fd, &vp, MTU)) <= 0)
+
+  if(taptype = 1)
     {
-      syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
-      return;
+      if((lenin = read(tap_fd, vp.data, MTU)) <= 0)
+        {
+          syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
+          return;
+        }
+      vp.len = lenin;
+    }
+  else
+    {
+      if((lenin = read(tap_fd, &vp, MTU)) <= 0)
+        {
+          syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
+          return;
+        }
+      vp.len = lenin - 2;
     }
 
   total_tap_in += lenin;
@@ -1107,10 +1182,6 @@ cp
   from = ntohl(*((unsigned long*)(&vp.data[26])));
   to = ntohl(*((unsigned long*)(&vp.data[30])));
 
-  vp.len = (length_t)lenin - 2;
-
-  strip_mac_addresses(&vp);
-
   send_packet(to, &vp);
 cp
 }