- route.c is now used to determine destination

- flags are removed, since they were not used at all. Use options instead.
- indirectdata works now, tcponly almost...
- made functions that don't return useful information void

diff --git a/src/Makefile.am b/src/Makefile.am
index 1f6b44b..73b40de 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
 ## Produce this file with automake to get Makefile.in
 ## Produce this file with automake to get Makefile.in

-# $Id: Makefile.am,v 1.4.4.12 2001/02/11 11:50:09 guus Exp $
+# $Id: Makefile.am,v 1.4.4.13 2001/03/04 13:59:25 guus Exp $

 
 sbin_PROGRAMS = tincd
 
 tincd_SOURCES = conf.c connection.c meta.c net.c netutl.c process.c    \
 
 sbin_PROGRAMS = tincd
 
 tincd_SOURCES = conf.c connection.c meta.c net.c netutl.c process.c    \

-       protocol.c subnet.c tincd.c
+       protocol.c route.c subnet.c tincd.c

 
 INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 
 noinst_HEADERS = conf.h connection.h meta.h net.h netutl.h process.h   \
 
 INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 
 noinst_HEADERS = conf.h connection.h meta.h net.h netutl.h process.h   \

-       protocol.h subnet.h
+       protocol.h route.h subnet.h

 
 LIBS = @LIBS@ @INTLLIBS@
 
 
 LIBS = @LIBS@ @INTLLIBS@
 

diff --git a/src/connection.c b/src/connection.c
index 1e34329..c1acfea 100644 (file)
--- a/src/connection.c
+++ b/src/connection.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.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: connection.c,v 1.1.2.9 2001/01/07 17:08:56 guus Exp $
+    $Id: connection.c,v 1.1.2.10 2001/03/04 13:59:25 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -190,15 +190,15 @@ void dump_connection_list(void)
 cp
   syslog(LOG_DEBUG, _("Connection list:"));
 
 cp
   syslog(LOG_DEBUG, _("Connection list:"));
 

-  syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),
-         myself->name, myself->hostname, myself->port, myself->flags,
+  syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"),
+         myself->name, myself->hostname, myself->port, myself->options,

          myself->socket, myself->meta_socket, myself->status);
 
   for(node = connection_tree->head; node; node = node->next)
     {
       cl = (connection_t *)node->data;
          myself->socket, myself->meta_socket, myself->status);
 
   for(node = connection_tree->head; node; node = node->next)
     {
       cl = (connection_t *)node->data;

-      syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),
-             cl->name, cl->hostname, cl->port, cl->flags,
+      syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"),
+             cl->name, cl->hostname, cl->port, cl->options,

              cl->socket, cl->meta_socket, cl->status);
     }
     
              cl->socket, cl->meta_socket, cl->status);
     }
     

diff --git a/src/connection.h b/src/connection.h
index eef6338..5d2d3be 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: connection.h,v 1.1.2.7 2001/01/07 20:19:29 guus Exp $
+    $Id: connection.h,v 1.1.2.8 2001/03/04 13:59:25 guus Exp $

 */
 
 #ifndef __TINC_CONNECTION_H__
 */
 
 #ifndef __TINC_CONNECTION_H__


@@ -70,7 +70,6 @@ typedef struct connection_t {
   short unsigned int port;         /* port number for UDP traffic */
   long int options;                /* options turned on for this connection */
 
   short unsigned int port;         /* port number for UDP traffic */
   long int options;                /* options turned on for this connection */
 

-  int flags;                       /* his flags */

   int socket;                      /* our udp vpn socket */
   int meta_socket;                 /* our tcp meta socket */
   status_bits_t status;            /* status info */
   int socket;                      /* our udp vpn socket */
   int meta_socket;                 /* our tcp meta socket */
   status_bits_t status;            /* status info */

diff --git a/src/net.c b/src/net.c
index 106549e..4ef654d 100644 (file)
--- 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.
 
     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.101 2001/03/01 21:32:01 guus Exp $
+    $Id: net.c,v 1.35.4.102 2001/03/04 13:59:25 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -85,6 +85,7 @@
 #include "protocol.h"
 #include "subnet.h"
 #include "process.h"
 #include "protocol.h"
 #include "subnet.h"
 #include "process.h"

+#include "route.h"

 
 #include "system.h"
 
 
 #include "system.h"
 


@@ -103,34 +104,43 @@ int keyexpires = 0;
 
 char *unknown = NULL;
 
 
 char *unknown = NULL;
 

-subnet_t mymac;
-
-int xsend(connection_t *cl, vpn_packet_t *inpkt)
+void send_udppacket(connection_t *cl, vpn_packet_t *inpkt)

 {
   vpn_packet_t outpkt;
   int outlen, outpad;
   EVP_CIPHER_CTX ctx;
   struct sockaddr_in to;
   socklen_t tolen = sizeof(to);
 {
   vpn_packet_t outpkt;
   int outlen, outpad;
   EVP_CIPHER_CTX ctx;
   struct sockaddr_in to;
   socklen_t tolen = sizeof(to);

+  vpn_packet_t *copy;

 cp
 cp

-  outpkt.len = inpkt->len;
-  
+  if(!cl->status.validkey)
+    {
+      if(debug_lvl >= DEBUG_TRAFFIC)
+       syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
+              cl->name, cl->hostname);
+
+      /* Since packet is on the stack of handle_tap_input(),
+         we have to make a copy of it first. */
+
+      copy = xmalloc(sizeof(vpn_packet_t));
+      memcpy(copy, inpkt, sizeof(vpn_packet_t));
+
+      list_insert_tail(cl->queue, copy);
+
+      if(!cl->status.waitingforkey)
+       send_req_key(myself, cl);
+      return;
+    }
+

   /* Encrypt the packet. */
   /* Encrypt the packet. */

-  
+
+  outpkt.len = inpkt->len;
+

   EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len);
   EVP_EncryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
   EVP_EncryptFinal(&ctx, outpkt.data + outlen, &outpad);
   outlen += outpad + 2;
 
   EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len);
   EVP_EncryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
   EVP_EncryptFinal(&ctx, outpkt.data + outlen, &outpad);
   outlen += outpad + 2;
 

-/* Bypass
-  outlen = outpkt.len + 2;
-  memcpy(&outpkt, inpkt, outlen);
-*/  
-
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
-           outlen, cl->name, cl->hostname);
-

   total_socket_out += outlen;
 
   to.sin_family = AF_INET;
   total_socket_out += outlen;
 
   to.sin_family = AF_INET;


@@ -141,13 +151,22 @@ cp
     {
       syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
              cl->name, cl->hostname);
     {
       syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
              cl->name, cl->hostname);

-      return -1;
+      return;

     }
 cp
     }
 cp

-  return 0;

 }
 
 }
 

-int xrecv(connection_t *cl, vpn_packet_t *inpkt)
+void receive_packet(connection_t *cl, vpn_packet_t *packet)
+{
+cp
+  if(debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, cl->name, cl->hostname);
+
+  route_incoming(cl, packet);
+cp
+}
+
+void receive_udppacket(connection_t *cl, vpn_packet_t *inpkt)

 {
   vpn_packet_t outpkt;
   int outlen, outpad;
 {
   vpn_packet_t outpkt;
   int outlen, outpad;


@@ -162,24 +181,17 @@ cp
   EVP_DecryptFinal(&ctx, outpkt.data + outlen, &outpad);
   outlen += outpad;
 
   EVP_DecryptFinal(&ctx, outpkt.data + outlen, &outpad);
   outlen += outpad;
 

-/* Bypass
-  outlen = outpkt.len+2;
-  memcpy(&outpkt, inpkt, outlen);
-*/
+  receive_packet(cl, &outpkt);

 cp
 cp

-  return receive_packet(cl, &outpkt);

 }
 
 }
 

-int receive_packet(connection_t *cl, vpn_packet_t *packet)
+void accept_packet(vpn_packet_t *packet)

 {
 {

+cp

   if(debug_lvl >= DEBUG_TRAFFIC)
   if(debug_lvl >= DEBUG_TRAFFIC)

-    syslog(LOG_ERR, _("Writing packet of %d bytes to tap device"),
+    syslog(LOG_DEBUG, _("Writing packet of %d bytes to tap device"),

            packet->len);
 
            packet->len);
 

-  /* Fix mac address */
-
-  memcpy(packet->data, mymac.net.mac.address.x, 6);
-

   if(taptype == TAP_TYPE_TUNTAP)
     {
       if(write(tap_fd, packet->data, packet->len) < 0)
   if(taptype == TAP_TYPE_TUNTAP)
     {
       if(write(tap_fd, packet->data, packet->len) < 0)


@@ -195,40 +207,26 @@ int receive_packet(connection_t *cl, vpn_packet_t *packet)
         total_tap_out += packet->len + 2;
     }
 cp
         total_tap_out += packet->len + 2;
     }
 cp

-  return 0;

 }
 
 /*
   send a packet to the given vpn ip.
 */
 }
 
 /*
   send a packet to the given vpn ip.
 */

-int send_packet(ip_t to, vpn_packet_t *packet)
+void send_packet(connection_t *cl, vpn_packet_t *packet)

 {
 {

-  connection_t *cl;
-  subnet_t *subnet;
-  vpn_packet_t *copy;

 cp
 cp

-  if((subnet = lookup_subnet_ipv4(&to)) == NULL)
-    {
-      if(debug_lvl >= DEBUG_TRAFFIC)
-        {
-          syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),
-                IP_ADDR_V(to));
-        }
-
-      return -1;
-    }
+  if(debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+           packet->len, cl->name, cl->hostname);

 
 

-  cl = subnet->owner;
-    

   if(cl == myself)
     {
       if(debug_lvl >= DEBUG_TRAFFIC)
         {
   if(cl == myself)
     {
       if(debug_lvl >= DEBUG_TRAFFIC)
         {

-          syslog(LOG_NOTICE, _("Packet with destination %d.%d.%d.%d is looping back to us!"),
-                IP_ADDR_V(to));
+          syslog(LOG_NOTICE, _("Packet is looping back to us!"));

         }
 
         }
 

-      return -1;
+      return;

     }
 
   if(!cl->status.active)
     }
 
   if(!cl->status.active)


@@ -237,34 +235,18 @@ cp
        syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"),
               cl->name, cl->hostname);
 
        syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"),
               cl->name, cl->hostname);
 

-      return 0;
+      return;

     }
 
     }
 

-  if(!cl->status.validkey)
+  /* Check if it has to go via TCP or UDP... */
+cp
+  if((cl->options | myself->options) & OPTION_TCPONLY)

     {
     {

-      if(debug_lvl >= DEBUG_TRAFFIC)
-       syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
-              cl->name, cl->hostname);
-
-      /* Since packet is on the stack of handle_tap_input(),
-         we have to make a copy of it first. */
-
-      copy = xmalloc(sizeof(vpn_packet_t));
-      memcpy(copy, packet, sizeof(vpn_packet_t));
-
-      list_insert_tail(cl->queue, copy);
-
-      if(!cl->status.waitingforkey)
-       send_req_key(myself, cl);                       /* Keys should be sent to the host running the tincd */
-      return 0;
+      if(send_tcppacket(cl, packet))
+        terminate_connection(cl);

     }
     }

-
-  /* Check if it has to go via UDP or TCP... */
-cp
-  if(cl->options & OPTION_TCPONLY)
-    return send_tcppacket(cl, packet);      

   else
   else

-    return xsend(cl, packet);
+    send_udppacket(cl, packet);

 }
 
 void flush_queue(connection_t *cl)
 }
 
 void flush_queue(connection_t *cl)


@@ -273,11 +255,11 @@ void flush_queue(connection_t *cl)
 cp
   if(debug_lvl >= DEBUG_TRAFFIC)
     syslog(LOG_INFO, _("Flushing queue for %s (%s)"), cl->name, cl->hostname);
 cp
   if(debug_lvl >= DEBUG_TRAFFIC)
     syslog(LOG_INFO, _("Flushing queue for %s (%s)"), cl->name, cl->hostname);

-  
+

   for(node = cl->queue->head; node; node = next)
     {
       next = node->next;
   for(node = cl->queue->head; node; node = next)
     {
       next = node->next;

-      xsend(cl, (vpn_packet_t *)node->data);
+      send_udppacket(cl, (vpn_packet_t *)node->data);

       list_delete_node(cl->queue, node);
     }
 cp
       list_delete_node(cl->queue, node);
     }
 cp


@@ -297,7 +279,7 @@ int setup_tap_fd(void)
 # endif
 #endif
 
 # endif
 #endif
 

-cp  
+cp

   if((cfg = get_config_val(config, config_tapdevice)))
     tapfname = cfg->data.ptr;
   else
   if((cfg = get_config_val(config, config_tapdevice)))
     tapfname = cfg->data.ptr;
   else


@@ -328,7 +310,7 @@ cp
   taptype = TAP_TYPE_ETHERTAP;
 
   /* Set default MAC address for ethertap devices */
   taptype = TAP_TYPE_ETHERTAP;
 
   /* Set default MAC address for ethertap devices */

-  
+

   mymac.type = SUBNET_MAC;
   mymac.net.mac.address.x[0] = 0xfe;
   mymac.net.mac.address.x[1] = 0xfd;
   mymac.type = SUBNET_MAC;
   mymac.net.mac.address.x[0] = 0xfe;
   mymac.net.mac.address.x[1] = 0xfd;


@@ -387,7 +369,7 @@ cp
     }
 
   /* Optimize TCP settings */
     }
 
   /* Optimize TCP settings */

-  
+

   option = 1;
   setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
   setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
   option = 1;
   setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
   setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));


@@ -395,7 +377,7 @@ cp
 
   option = IPTOS_LOWDELAY;
   setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
 
   option = IPTOS_LOWDELAY;
   setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));

-  
+

   if((cfg = get_config_val(config, config_interface)))
     {
       if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, cfg->data.ptr, strlen(cfg->data.ptr)))
   if((cfg = get_config_val(config, config_interface)))
     {
       if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, cfg->data.ptr, strlen(cfg->data.ptr)))


@@ -409,7 +391,7 @@ cp
   memset(&a, 0, sizeof(a));
   a.sin_family = AF_INET;
   a.sin_port = htons(port);
   memset(&a, 0, sizeof(a));
   a.sin_family = AF_INET;
   a.sin_port = htons(port);

-  
+

   if((cfg = get_config_val(config, config_interfaceip)))
     a.sin_addr.s_addr = htonl(cfg->data.ip->address);
   else
   if((cfg = get_config_val(config, config_interfaceip)))
     a.sin_addr.s_addr = htonl(cfg->data.ip->address);
   else


@@ -516,16 +498,16 @@ cp
     }
 
   /* Optimize TCP settings */
     }
 
   /* Optimize TCP settings */

-  
+

   option = 1;
   setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
   setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
 
   option = IPTOS_LOWDELAY;
   setsockopt(cl->meta_socket, SOL_IP, IP_TOS, &option, sizeof(option));
   option = 1;
   setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
   setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
 
   option = IPTOS_LOWDELAY;
   setsockopt(cl->meta_socket, SOL_IP, IP_TOS, &option, sizeof(option));

-  
+

   /* Connect */
   /* Connect */

-  
+

   a.sin_family = AF_INET;
   a.sin_port = htons(cl->port);
   a.sin_addr.s_addr = htonl(cl->address);
   a.sin_family = AF_INET;
   a.sin_port = htons(cl->port);
   a.sin_addr.s_addr = htonl(cl->address);


@@ -572,21 +554,21 @@ cp
 
   ncn = new_connection();
   asprintf(&ncn->name, "%s", name);
 
   ncn = new_connection();
   asprintf(&ncn->name, "%s", name);

-    
+

   if(read_host_config(ncn))
     {
       syslog(LOG_ERR, _("Error reading host configuration file for %s"), ncn->name);
       free_connection(ncn);
       return -1;
     }
   if(read_host_config(ncn))
     {
       syslog(LOG_ERR, _("Error reading host configuration file for %s"), ncn->name);
       free_connection(ncn);
       return -1;
     }

-    
+

   if(!(cfg = get_config_val(ncn->config, config_address)))
     {
       syslog(LOG_ERR, _("No address specified for %s"), ncn->name);
       free_connection(ncn);
       return -1;
     }
   if(!(cfg = get_config_val(ncn->config, config_address)))
     {
       syslog(LOG_ERR, _("No address specified for %s"), ncn->name);
       free_connection(ncn);
       return -1;
     }

-    
+

   if(!(h = gethostbyname(cfg->data.ptr)))
     {
       syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
   if(!(h = gethostbyname(cfg->data.ptr)))
     {
       syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);


@@ -596,7 +578,7 @@ cp
 
   ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
   ncn->hostname = hostlookup(htonl(ncn->address));
 
   ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
   ncn->hostname = hostlookup(htonl(ncn->address));

-  
+

   if(setup_outgoing_meta_socket(ncn) < 0)
     {
       syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
   if(setup_outgoing_meta_socket(ncn) < 0)
     {
       syslog(LOG_ERR, _("Could not set up a meta connection to %s"),


@@ -660,10 +642,10 @@ cp
         }
       else
         return -1;
         }
       else
         return -1;

-    }    
+    }

 
   /* Else, check if a harnessed public key is in the config file */
 
   /* Else, check if a harnessed public key is in the config file */

-  
+

   asprintf(&fname, "%s/hosts/%s", confbase, cl->name);
   if((fp = fopen(fname, "r")))
     {
   asprintf(&fname, "%s/hosts/%s", confbase, cl->name);
   if((fp = fopen(fname, "r")))
     {


@@ -713,7 +695,7 @@ cp
                 cfg->data.ptr);
           return -1;
         }
                 cfg->data.ptr);
           return -1;
         }

-    }    
+    }

   else
     {
       syslog(LOG_ERR, _("No private key for tinc daemon specified!"));
   else
     {
       syslog(LOG_ERR, _("No private key for tinc daemon specified!"));


@@ -735,7 +717,7 @@ cp
   myself = new_connection();
 
   asprintf(&myself->hostname, "MYSELF");
   myself = new_connection();
 
   asprintf(&myself->hostname, "MYSELF");

-  myself->flags = 0;
+  myself->options = 0;

   myself->protocol_version = PROT_CURRENT;
 
   if(!(cfg = get_config_val(config, config_name))) /* Not acceptable */
   myself->protocol_version = PROT_CURRENT;
 
   if(!(cfg = get_config_val(config, config_name))) /* Not acceptable */


@@ -763,7 +745,7 @@ cp
 
   if(read_rsa_public_key(myself))
     return -1;
 
   if(read_rsa_public_key(myself))
     return -1;

-cp  
+cp

 
 /*
   if(RSA_check_key(myself->rsa_key) != 1)
 
 /*
   if(RSA_check_key(myself->rsa_key) != 1)


@@ -779,11 +761,11 @@ cp
 
   if((cfg = get_config_val(myself->config, config_indirectdata)))
     if(cfg->data.val == stupid_true)
 
   if((cfg = get_config_val(myself->config, config_indirectdata)))
     if(cfg->data.val == stupid_true)

-      myself->flags |= EXPORTINDIRECTDATA;
+      myself->options |= OPTION_INDIRECT;

 
   if((cfg = get_config_val(myself->config, config_tcponly)))
     if(cfg->data.val == stupid_true)
 
   if((cfg = get_config_val(myself->config, config_tcponly)))
     if(cfg->data.val == stupid_true)

-      myself->flags |= TCPONLY;
+      myself->options |= OPTION_TCPONLY;

 
 /* Read in all the subnets specified in the host configuration file */
 
 
 /* Read in all the subnets specified in the host configuration file */
 


@@ -793,18 +775,18 @@ cp
       net->type = SUBNET_IPV4;
       net->net.ipv4.address = cfg->data.ip->address;
       net->net.ipv4.mask = cfg->data.ip->mask;
       net->type = SUBNET_IPV4;
       net->net.ipv4.address = cfg->data.ip->address;
       net->net.ipv4.mask = cfg->data.ip->mask;

-      
+

       /* Teach newbies what subnets are... */
       /* Teach newbies what subnets are... */

-      
+

       if((net->net.ipv4.address & net->net.ipv4.mask) != net->net.ipv4.address)
         {
           syslog(LOG_ERR, _("Network address and subnet mask do not match!"));
           return -1;
       if((net->net.ipv4.address & net->net.ipv4.mask) != net->net.ipv4.address)
         {
           syslog(LOG_ERR, _("Network address and subnet mask do not match!"));
           return -1;

-        }        
-      
+        }
+

       subnet_add(myself, net);
     }
       subnet_add(myself, net);
     }

-    
+

   if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
   if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));


@@ -830,11 +812,11 @@ cp
     keylifetime = 3600;
   else
     keylifetime = cfg->data.val;
     keylifetime = 3600;
   else
     keylifetime = cfg->data.val;

-    
+

   keyexpires = time(NULL) + keylifetime;
 cp
   /* Check some options */
   keyexpires = time(NULL) + keylifetime;
 cp
   /* Check some options */

-  
+

   if((cfg = get_config_val(config, config_indirectdata)))
     {
       if(cfg->data.val == stupid_true)
   if((cfg = get_config_val(config, config_indirectdata)))
     {
       if(cfg->data.val == stupid_true)


@@ -846,6 +828,10 @@ cp
       if(cfg->data.val == stupid_true)
         myself->options |= OPTION_TCPONLY;
     }
       if(cfg->data.val == stupid_true)
         myself->options |= OPTION_TCPONLY;
     }

+
+  if(myself->options & OPTION_TCPONLY)
+    myself->options |= OPTION_INDIRECT;
+

   /* Activate ourselves */
 
   myself->status.active = 1;
   /* Activate ourselves */
 
   myself->status.active = 1;


@@ -914,7 +900,7 @@ cp
 
   /* Run tinc-up script to further initialize the tap interface */
   execute_script("tinc-up");
 
   /* Run tinc-up script to further initialize the tap interface */
   execute_script("tinc-up");

-  
+

   if(setup_myself() < 0)
     return -1;
 
   if(setup_myself() < 0)
     return -1;
 


@@ -929,7 +915,7 @@ cp
         return 0;
       cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
     }
         return 0;
       cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
     }

-    
+

   if(do_detach)
     {
       signal(SIGALRM, sigalrm_handler);
   if(do_detach)
     {
       signal(SIGALRM, sigalrm_handler);


@@ -1008,7 +994,7 @@ cp
   p->buffer = xmalloc(MAXBUFSIZE);
   p->buflen = 0;
   p->last_ping_time = time(NULL);
   p->buffer = xmalloc(MAXBUFSIZE);
   p->buflen = 0;
   p->last_ping_time = time(NULL);

-  
+

   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Connection from %s port %d"),
          p->hostname, htons(ci.sin_port));
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Connection from %s port %d"),
          p->hostname, htons(ci.sin_port));


@@ -1047,7 +1033,7 @@ cp
   udp socket and write it to the ethertap
   device after being decrypted
 */
   udp socket and write it to the ethertap
   device after being decrypted
 */

-int handle_incoming_vpn_data(void)
+void handle_incoming_vpn_data(void)

 {
   vpn_packet_t pkt;
   int x, l = sizeof(x);
 {
   vpn_packet_t pkt;
   int x, l = sizeof(x);


@@ -1060,36 +1046,30 @@ cp
     {
       syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"),
             __FILE__, __LINE__, myself->socket);
     {
       syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"),
             __FILE__, __LINE__, myself->socket);

-      return -1;
+      return;

     }
   if(x)
     {
       syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
     }
   if(x)
     {
       syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));

-      return -1;
+      return;

     }
 
   if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
     {
       syslog(LOG_ERR, _("Receiving packet failed: %m"));
     }
 
   if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
     {
       syslog(LOG_ERR, _("Receiving packet failed: %m"));

-      return -1;
+      return;

     }
 
   cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
     }
 
   cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));

-  
+

   if(!cl)
     {
       syslog(LOG_WARNING, _("Received UDP packets on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
   if(!cl)
     {
       syslog(LOG_WARNING, _("Received UDP packets on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));

-      return 0;
-    }
-
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    {
-      syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), lenin,
-             cl->name, cl->hostname);
+      return;

     }
 
     }
 

+  receive_udppacket(cl, &pkt);

 cp
 cp

-  return xrecv(cl, &pkt);

 }
 
 /*
 }
 
 /*


@@ -1108,9 +1088,9 @@ cp
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
            cl->name, cl->hostname);
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
            cl->name, cl->hostname);

- 
+

   cl->status.remove = 1;
   cl->status.remove = 1;

-  
+

   if(cl->socket)
     close(cl->socket);
   if(cl->status.meta)
   if(cl->socket)
     close(cl->socket);
   if(cl->status.meta)


@@ -1118,7 +1098,7 @@ cp
 
   if(cl->status.meta)
     {
 
   if(cl->status.meta)
     {

-    
+

       /* Find all connections that were lost because they were behind cl
          (the connection that was dropped). */
 
       /* Find all connections that were lost because they were behind cl
          (the connection that was dropped). */
 


@@ -1150,7 +1130,7 @@ cp
     }
 
   /* Check if this was our outgoing connection */
     }
 
   /* Check if this was our outgoing connection */

-    
+

   if(cl->status.outgoing)
     {
       cl->status.outgoing = 0;
   if(cl->status.outgoing)
     {
       cl->status.outgoing = 0;


@@ -1232,7 +1212,7 @@ cp
     }
 
   connection_add(ncn);
     }
 
   connection_add(ncn);

-  
+

   send_id(ncn);
 cp
   return 0;
   send_id(ncn);
 cp
   return 0;


@@ -1263,9 +1243,9 @@ cp
            {
              terminate_connection(p);
              return;
            {
              terminate_connection(p);
              return;

-           } 
+           }

     }
     }

-    
+

   if(FD_ISSET(myself->meta_socket, f))
     handle_new_meta_connection();
 cp
   if(FD_ISSET(myself->meta_socket, f))
     handle_new_meta_connection();
 cp


@@ -1279,7 +1259,7 @@ void handle_tap_input(void)
 {
   vpn_packet_t vp;
   int lenin;
 {
   vpn_packet_t vp;
   int lenin;

-cp  
+cp

   if(taptype == TAP_TYPE_TUNTAP)
     {
       if((lenin = read(tap_fd, vp.data, MTU)) <= 0)
   if(taptype == TAP_TYPE_TUNTAP)
     {
       if((lenin = read(tap_fd, vp.data, MTU)) <= 0)


@@ -1313,7 +1293,7 @@ cp
       syslog(LOG_DEBUG, _("Read packet of length %d from tap device"), vp.len);
     }
 
       syslog(LOG_DEBUG, _("Read packet of length %d from tap device"), vp.len);
     }
 

-  send_packet(ntohl(*((unsigned long*)(&vp.data[30]))), &vp);
+  route_outgoing(&vp);

 cp
 }
 
 cp
 }
 


@@ -1361,10 +1341,10 @@ cp
             }
 
           sleep(5);
             }
 
           sleep(5);

-          
+

           if(setup_network_connections())
             return;
           if(setup_network_connections())
             return;

-            
+

           continue;
         }
 
           continue;
         }
 


@@ -1383,7 +1363,7 @@ cp
             {
               if(debug_lvl >= DEBUG_STATUS)
                 syslog(LOG_INFO, _("Regenerating symmetric key"));
             {
               if(debug_lvl >= DEBUG_STATUS)
                 syslog(LOG_INFO, _("Regenerating symmetric key"));

-                
+

               RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
               send_key_changed(myself, NULL);
               keyexpires = time(NULL) + keylifetime;
               RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
               send_key_changed(myself, NULL);
               keyexpires = time(NULL) + keylifetime;

diff --git a/src/net.h b/src/net.h
index 18b5472..3028300 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: net.h,v 1.9.4.28 2001/02/27 16:37:28 guus Exp $
+    $Id: net.h,v 1.9.4.29 2001/03/04 13:59:28 guus Exp $

 */
 
 #ifndef __TINC_NET_H__
 */
 
 #ifndef __TINC_NET_H__


@@ -47,11 +47,6 @@
 
 #define MAXBUFSIZE 4096 /* Probably way too much, but it must fit every possible request. */
 
 
 #define MAXBUFSIZE 4096 /* Probably way too much, but it must fit every possible request. */
 

-/* flags */
-#define INDIRECTDATA        0x0001 /* Used to indicate that this host has to be reached indirect */
-#define EXPORTINDIRECTDATA  0x0002 /* Used to indicate uplink that it has to tell others to do INDIRECTDATA */
-#define TCPONLY             0x0004 /* Tells sender to send packets over TCP instead of UDP (for firewalls) */
-

 /* tap types */
 #define TAP_TYPE_ETHERTAP 0
 #define TAP_TYPE_TUNTAP   1
 /* tap types */
 #define TAP_TYPE_ETHERTAP 0
 #define TAP_TYPE_TUNTAP   1


@@ -112,8 +107,9 @@ extern char *status_text[10];
 
 extern int str2opt(const char *);
 extern char *opt2str(int);
 
 extern int str2opt(const char *);
 extern char *opt2str(int);

-extern int send_packet(ip_t, vpn_packet_t *);
-extern int receive_packet(connection_t *, vpn_packet_t *);
+extern void send_packet(connection_t *, vpn_packet_t *);
+extern void receive_packet(connection_t *, vpn_packet_t *);
+extern void accept_packet(vpn_packet_t *);

 extern int setup_network_connections(void);
 extern void close_network_connections(void);
 extern void main_loop(void);
 extern int setup_network_connections(void);
 extern void close_network_connections(void);
 extern void main_loop(void);

diff --git a/src/protocol.c b/src/protocol.c
index 97b51b4..6da4025 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.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.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: protocol.c,v 1.28.4.84 2001/03/02 11:25:56 guus Exp $
+    $Id: protocol.c,v 1.28.4.85 2001/03/04 13:59:28 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -119,7 +119,7 @@ int receive_request(connection_t *cl)
 cp  
   if(sscanf(cl->buffer, "%d", &request) == 1)
     {
 cp  
   if(sscanf(cl->buffer, "%d", &request) == 1)
     {

-      if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+      if((request < 0) || (request >= LAST) || (request_handlers[request] == NULL))

         {
           syslog(LOG_ERR, _("Unknown request from %s (%s)"),
                 cl->name, cl->hostname);
         {
           syslog(LOG_ERR, _("Unknown request from %s (%s)"),
                 cl->name, cl->hostname);


@@ -1264,7 +1264,7 @@ cp
 int send_tcppacket(connection_t *cl, vpn_packet_t *packet)
 {
   int x;
 int send_tcppacket(connection_t *cl, vpn_packet_t *packet)
 {
   int x;

-  
+cp  

   x = send_request(cl->nexthop, "%d %hd", PACKET, packet->len);
 
   if(x)
   x = send_request(cl->nexthop, "%d %hd", PACKET, packet->len);
 
   if(x)


@@ -1278,8 +1278,8 @@ int tcppacket_h(connection_t *cl)
   vpn_packet_t packet;
   char *p;
   int todo, x;
   vpn_packet_t packet;
   char *p;
   int todo, x;

-  
-  if(sscanf(cl->buffer, "%*d %hd", packet.len) != 1)
+cp  
+  if(sscanf(cl->buffer, "%*d %hd", &packet.len) != 1)

     {
       syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), cl->name, cl->hostname);
       return -1;
     {
       syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), cl->name, cl->hostname);
       return -1;


@@ -1289,7 +1289,7 @@ int tcppacket_h(connection_t *cl)
 
   p = packet.data;
   todo = packet.len;
 
   p = packet.data;
   todo = packet.len;

-  
+

   while(todo)
     {
       x = read(cl->meta_socket, p, todo);
   while(todo)
     {
       x = read(cl->meta_socket, p, todo);


@@ -1299,7 +1299,7 @@ int tcppacket_h(connection_t *cl)
           if(x==0)
             syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), cl->name, cl->hostname);
           else
           if(x==0)
             syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), cl->name, cl->hostname);
           else

-            if(errno==EINTR)
+            if(errno==EINTR || errno==EAGAIN)  /* FIXME: select() or poll() or reimplement this evil hack */

               continue;
             else
               syslog(LOG_ERR, _("Error during reception of PACKET from %s (%s): %m"), cl->name, cl->hostname);
               continue;
             else
               syslog(LOG_ERR, _("Error during reception of PACKET from %s (%s): %m"), cl->name, cl->hostname);


@@ -1311,7 +1311,9 @@ int tcppacket_h(connection_t *cl)
       p += x;
     }
 
       p += x;
     }
 

-  return receive_packet(cl, &packet);
+  receive_packet(cl, &packet);
+cp
+  return 0;

 }
 
 /* Jumptable for the request handlers */
 }
 
 /* Jumptable for the request handlers */

diff --git a/src/route.c b/src/route.c
index 43fe523..c93379b 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -17,11 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: route.c,v 1.1.2.6 2001/01/07 17:09:06 guus Exp $
+    $Id: route.c,v 1.1.2.7 2001/03/04 13:59:32 guus Exp $

 */
 
 #include "config.h"
 
 */
 
 #include "config.h"
 

+#include <netinet/in.h>

 #include <utils.h>
 #include <xalloc.h>
 #include <syslog.h>
 #include <utils.h>
 #include <xalloc.h>
 #include <syslog.h>


@@ -34,15 +35,15 @@
 #include "system.h"
 
 int routing_mode = RMODE_ROUTER;
 #include "system.h"
 
 int routing_mode = RMODE_ROUTER;

+subnet_t mymac;

 
 void learn_mac(connection_t *source, mac_t *address)
 {
 
 void learn_mac(connection_t *source, mac_t *address)
 {

-  connection_t *old;

   subnet_t *subnet;
 cp
   subnet_t *subnet;
 cp

-  old = lookup_subnet_mac(address)->owner;
+  subnet = lookup_subnet_mac(address);

   
   

-  if(!old)
+  if(!subnet)

     {
       subnet = new_subnet();
       subnet->type = SUBNET_MAC;
     {
       subnet = new_subnet();
       subnet->type = SUBNET_MAC;


@@ -50,23 +51,22 @@ cp
       memcpy(&subnet->net.mac.address, address, sizeof(mac_t));
       subnet_add(source, subnet);
 
       memcpy(&subnet->net.mac.address, address, sizeof(mac_t));
       subnet_add(source, subnet);
 

-      if(DEBUG_LVL >= DEBUG_TRAFFIC)
+      if(debug_lvl >= DEBUG_TRAFFIC)

         {
           syslog(LOG_DEBUG, _("Learned new MAC address %x:%x:%x:%x:%x:%x from %s (%s)"),
         {
           syslog(LOG_DEBUG, _("Learned new MAC address %x:%x:%x:%x:%x:%x from %s (%s)"),

-               address->address.x[0],
-               address->address.x[1],
-               address->address.x[2],
-               address->address.x[3],
-               address->address.x[4],
-               address->address.x[5],
-               cl->name, cl->hostname);
+               address->x[0],
+               address->x[1],
+               address->x[2],
+               address->x[3],
+               address->x[4],
+               address->x[5],
+               source->name, source->hostname);

         }
     }
 }
 
 connection_t *route_mac(connection_t *source, vpn_packet_t *packet)
 {
         }
     }
 }
 
 connection_t *route_mac(connection_t *source, vpn_packet_t *packet)
 {

-  connection_t *oldsrc, *dst;

   subnet_t *subnet;
 cp
   /* Learn source address */
   subnet_t *subnet;
 cp
   /* Learn source address */


@@ -75,39 +75,47 @@ cp
   
   /* Lookup destination address */
     
   
   /* Lookup destination address */
     

-  dst = lookup_subnet_mac((mac_t *)(&packet->data[6]))->owner;
-
-  if(!dst)
-    if(debug_lvl >= DEBUG_TRAFFIC)
-      {
-        syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %x:%x:%x:%x:%x:%x"),
-               packet->data[6],
-               packet->data[7],
-               packet->data[8],
-               packet->data[9],
-               packet->data[10],
-               packet->data[11]);
-      } 
+  subnet = lookup_subnet_mac((mac_t *)(&packet->data[6]));
+
+  if(!subnet)
+    {
+      if(debug_lvl >= DEBUG_TRAFFIC)
+        {
+          syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %x:%x:%x:%x:%x:%x"),
+                 packet->data[6],
+                 packet->data[7],
+                 packet->data[8],
+                 packet->data[9],
+                 packet->data[10],
+                 packet->data[11]);
+        } 
+      return NULL;
+    }

 cp  
 cp  

-  return dst;  
+  return subnet->owner;  

 }
 
 connection_t *route_ipv4(vpn_packet_t *packet)
 {
   ipv4_t dest;
 }
 
 connection_t *route_ipv4(vpn_packet_t *packet)
 {
   ipv4_t dest;

-  connection_t *cl;
+  subnet_t *subnet;

 cp
   dest = ntohl(*((unsigned long*)(&packet->data[30])));
   
 cp
   dest = ntohl(*((unsigned long*)(&packet->data[30])));
   

-  cl = lookup_subnet_ipv4(&dest)->owner;
-  if(!cl)
-    if(debug_lvl >= DEBUG_TRAFFIC)
-      {
-        syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %d.%d.%d.%d"),
-               packet->data[30], packet->data[31], packet->data[32], packet->data[33]);
-      } 
+  subnet = lookup_subnet_ipv4(&dest);
+
+  if(!subnet)
+    {
+      if(debug_lvl >= DEBUG_TRAFFIC)
+        {
+          syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %d.%d.%d.%d"),
+                 packet->data[30], packet->data[31], packet->data[32], packet->data[33]);
+        }
+
+      return NULL;
+    }

 cp
 cp

-  return cl;  
+  return subnet->owner;  

 }
 
 connection_t *route_ipv6(vpn_packet_t *packet)
 }
 
 connection_t *route_ipv6(vpn_packet_t *packet)


@@ -124,7 +132,7 @@ cp
 void route_outgoing(vpn_packet_t *packet)
 {
   unsigned short int type;
 void route_outgoing(vpn_packet_t *packet)
 {
   unsigned short int type;

-  avl_tree_t *node;
+  avl_node_t *node;

   connection_t *cl;
 cp
   /* FIXME: multicast? */
   connection_t *cl;
 cp
   /* FIXME: multicast? */


@@ -148,11 +156,12 @@ cp
                 }
               return;
            }
                 }
               return;
            }

-         send_packet(cl, packet);
+         if(cl)
+           send_packet(cl, packet);

          break;
         
       case RMODE_SWITCH:
          break;
         
       case RMODE_SWITCH:

-        cl = route_mac(packet);
+        cl = route_mac(myself, packet);

         if(cl)
           send_packet(cl, packet);
         break;
         if(cl)
           send_packet(cl, packet);
         break;


@@ -173,8 +182,10 @@ void route_incoming(connection_t *source, vpn_packet_t *packet)
   switch(routing_mode)
     {
       case RMODE_SWITCH:
   switch(routing_mode)
     {
       case RMODE_SWITCH:

-        learn_mac(source, &packet->data[0]);
+        learn_mac(source, (mac_t *)(&packet->data[0]));

         break;
         break;

+      case RMODE_ROUTER:
+        memcpy(packet->data, mymac.net.mac.address.x, 6);

     }
   
   accept_packet(packet);
     }
   
   accept_packet(packet);

diff --git a/src/route.h b/src/route.h
index e7316cb..4eafc3b 100644 (file)
--- a/src/route.h
+++ b/src/route.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: route.h,v 1.1.2.2 2001/01/07 17:09:06 guus Exp $
+    $Id: route.h,v 1.1.2.3 2001/03/04 13:59:32 guus Exp $

 */
 
 #ifndef __TINC_ROUTE_H__
 */
 
 #ifndef __TINC_ROUTE_H__


@@ -31,8 +31,9 @@ enum
 };
 
 extern int routing_mode;
 };
 
 extern int routing_mode;

+extern subnet_t mymac;

 
 

-extern connection_t *route_incoming(connection_t *, vpn_packet_t *);
-extern connection_t *route_outgoing(connection_t *, vpn_packet_t *);
+extern void route_incoming(connection_t *, vpn_packet_t *);
+extern void route_outgoing(vpn_packet_t *);

 
 #endif /* __TINC_ROUTE_H__ */
 
 #endif /* __TINC_ROUTE_H__ */