X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=f42b6a554f6bc5844d7df56a763c7c152ddd800d;hp=e9451c8c18acdcfec4947816bff1e39e1ac3e30b;hb=024ab44d98883d78cefe2c622cec9831c7f19c13;hpb=ed509312906625acee4007da6262de3898846888

diff --git a/src/route.c b/src/route.c
index e9451c8c..f42b6a55 100644
--- a/src/route.c
+++ b/src/route.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: route.c,v 1.1.2.24 2002/02/20 16:04:59 guus Exp $
+    $Id: route.c,v 1.1.2.29 2002/03/10 14:04:48 guus Exp $
 */
 
 #include "config.h"
@@ -51,6 +51,8 @@
 #include "system.h"
 
 int routing_mode = RMODE_ROUTER;
+int priorityinheritance = 0;
+int macexpire = 600;
 subnet_t mymac;
 
 void learn_mac(mac_t *address)
@@ -83,6 +85,35 @@ cp
             send_add_subnet(c, subnet);
         }
     }
+
+  subnet->net.mac.lastseen = now;
+}
+
+void age_mac(void)
+{
+  subnet_t *s;
+  connection_t *c;
+  avl_node_t *node, *next, *node2;
+cp
+  for(node = myself->subnet_tree->head; node; node = next)
+    {
+      next = node->next;
+      s = (subnet_t *)node->data;
+      if(s->type == SUBNET_MAC && s->net.mac.lastseen && s->net.mac.lastseen + macexpire < now)
+        {
+	  if(debug_lvl >= DEBUG_TRAFFIC)
+            syslog(LOG_INFO, _("MAC address %hx:%hx:%hx:%hx:%hx:%hx expired"),
+        	   s->net.mac.address.x[0], s->net.mac.address.x[1], s->net.mac.address.x[2], s->net.mac.address.x[3],  s->net.mac.address.x[4], s->net.mac.address.x[5]);
+	  for(node2 = connection_tree->head; node2; node2 = node2->next)
+            {
+              c = (connection_t *)node2->data;
+              if(c->status.active)
+        	send_del_subnet(c, s);
+            }
+          subnet_del(myself, s);
+	}
+    }
+cp
 }
 
 node_t *route_mac(vpn_packet_t *packet)
@@ -107,6 +138,9 @@ node_t *route_ipv4(vpn_packet_t *packet)
 {
   subnet_t *subnet;
 cp
+  if(priorityinheritance)
+    packet->priority = packet->data[15];
+
   subnet = lookup_subnet_ipv4((ipv4_t *)&packet->data[30]);
 cp
   if(!subnet)
@@ -220,7 +254,7 @@ cp
 void route_outgoing(vpn_packet_t *packet)
 {
   unsigned short int type;
-  node_t *n;
+  node_t *n = NULL;
 cp
   /* FIXME: multicast? */
 
@@ -270,9 +304,22 @@ void route_incoming(node_t *source, vpn_packet_t *packet)
     {
       case RMODE_ROUTER:
         {
-          node_t *n;
+          node_t *n = NULL;
+	  unsigned short int type;
 
-          n = route_ipv4(packet);
+          type = ntohs(*((unsigned short*)(&packet->data[12])));
+          switch(type)
+            {
+              case 0x0800:
+        	n = route_ipv4(packet);
+        	break;
+              case 0x86DD:
+        	n = route_ipv6(packet);
+        	break;
+              default:
+                n = myself;
+		break;
+             }
 
           if(n)
             {