]> git.meshlink.io Git - meshlink/blobdiff - src/route.c
Merge branch 'master' into 1.1
[meshlink] / src / route.c
index e79fae51f130a9ce4f5182d789022b41ab74aeda..da37473ca930ed64a26c517248ab7f12f0f820b4 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "connection.h"
 #include "ethernet.h"
 #include "ipv4.h"
@@ -51,6 +51,8 @@ static const size_t icmp6_size = sizeof(struct icmp6_hdr);
 static const size_t ns_size = sizeof(struct nd_neighbor_solicit);
 static const size_t opt_size = sizeof(struct nd_opt_hdr);
 
+static struct event age_subnets_event;
+
 /* RFC 1071 */
 
 static uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
@@ -75,6 +77,7 @@ static uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
 static bool ratelimit(int frequency) {
        static time_t lasttime = 0;
        static int count = 0;
+       time_t now = time(NULL);
        
        if(lasttime == now) {
                if(++count > frequency)
@@ -94,48 +97,21 @@ static bool checklength(node_t *source, vpn_packet_t *packet, length_t length) {
        } else
                return true;
 }
-       
-static void learn_mac(mac_t *address)
-{
-       subnet_t *subnet;
-       avl_node_t *node;
-       connection_t *c;
-
-       cp();
-
-       subnet = lookup_subnet_mac(address);
-
-       /* If we don't know this MAC address yet, store it */
-
-       if(!subnet) {
-               ifdebug(TRAFFIC) logger(LOG_INFO, _("Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx"),
-                                  address->x[0], address->x[1], address->x[2], address->x[3],
-                                  address->x[4], address->x[5]);
-
-               subnet = new_subnet();
-               subnet->type = SUBNET_MAC;
-               subnet->expires = now + macexpire;
-               subnet->net.mac.address = *address;
-               subnet_add(myself, subnet);
-
-               /* And tell all other tinc daemons it's our MAC */
-
-               for(node = connection_tree->head; node; node = node->next) {
-                       c = node->data;
-                       if(c->status.active)
-                               send_add_subnet(c, subnet);
-               }
-       }
 
-       if(subnet->expires)
-               subnet->expires = now + macexpire;
+static void swap_mac_addresses(vpn_packet_t *packet) {
+       mac_t tmp;
+       memcpy(&tmp, &packet->data[0], sizeof tmp);
+       memcpy(&packet->data[0], &packet->data[6], sizeof tmp);
+       memcpy(&packet->data[6], &tmp, sizeof tmp);
 }
-
-void age_subnets(void)
+       
+static void age_subnets(int fd, short events, void *data)
 {
        subnet_t *s;
        connection_t *c;
-       avl_node_t *node, *next, *node2;
+       splay_node_t *node, *next, *node2;
+       bool left = false;
+       time_t now = time(NULL);
 
        cp();
 
@@ -156,42 +132,54 @@ void age_subnets(void)
                        }
 
                        subnet_del(myself, s);
+               } else {
+                       if(s->expires)
+                               left = true;
                }
        }
+
+       if(left)
+               event_add(&age_subnets_event, &(struct timeval){10, 0});
 }
 
-static void route_mac(node_t *source, vpn_packet_t *packet)
+static void learn_mac(mac_t *address)
 {
        subnet_t *subnet;
-       mac_t dest;
+       splay_node_t *node;
+       connection_t *c;
 
        cp();
 
+       subnet = lookup_subnet_mac(address);
 
-       /* Learn source address */
+       /* If we don't know this MAC address yet, store it */
 
-       if(source == myself) {
-               mac_t src;
-               memcpy(&src, &packet->data[6], sizeof src);
-               learn_mac(&src);
-       }
+       if(!subnet) {
+               ifdebug(TRAFFIC) logger(LOG_INFO, _("Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx"),
+                                  address->x[0], address->x[1], address->x[2], address->x[3],
+                                  address->x[4], address->x[5]);
 
-       /* Lookup destination address */
+               subnet = new_subnet();
+               subnet->type = SUBNET_MAC;
+               subnet->expires = time(NULL) + macexpire;
+               subnet->net.mac.address = *address;
+               subnet_add(myself, subnet);
 
-       memcpy(&dest, &packet->data[0], sizeof dest);
-       subnet = lookup_subnet_mac(&dest);
+               /* And tell all other tinc daemons it's our MAC */
 
-       if(!subnet) {
-               broadcast_packet(source, packet);
-               return;
-       }
+               for(node = connection_tree->head; node; node = node->next) {
+                       c = node->data;
+                       if(c->status.active)
+                               send_add_subnet(c, subnet);
+               }
 
-       if(subnet->owner == source) {
-               ifdebug(TRAFFIC) logger(LOG_WARNING, _("Packet looping back to %s (%s)!"), source->name, source->hostname);
-               return;
+               if(!timeout_initialized(&age_subnets_event))
+                       timeout_set(&age_subnets_event, age_subnets, NULL);
+               event_add(&age_subnets_event, &(struct timeval){10, 0});
+       } else {
+               if(subnet->expires)
+                       subnet->expires = time(NULL) + macexpire;
        }
-
-       send_packet(subnet->owner, packet);
 }
 
 /* RFC 792 */
@@ -210,6 +198,10 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
        
        cp();
 
+       /* Swap Ethernet source and destination addresses */
+
+       swap_mac_addresses(packet);
+
        /* Copy headers from packet into properly aligned structs on the stack */
 
        memcpy(&ip, packet->data + ether_size, ip_size);
@@ -406,6 +398,10 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
        
        cp();
 
+       /* Swap Ethernet source and destination addresses */
+
+       swap_mac_addresses(packet);
+
        /* Copy headers from packet to structs on the stack */
 
        memcpy(&ip6, packet->data + ether_size, ip6_size);
@@ -449,7 +445,7 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
 
        /* Generate checksum */
        
-       checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
+       checksum = inet_checksum(&pseudo, sizeof pseudo, ~0);
        checksum = inet_checksum(&icmp6, icmp6_size, checksum);
        checksum = inet_checksum(packet->data + ether_size + ip6_size + icmp6_size, ntohl(pseudo.length) - icmp6_size, checksum);
 
@@ -574,7 +570,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 
        /* Generate checksum */
 
-       checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
+       checksum = inet_checksum(&pseudo, sizeof pseudo, ~0);
        checksum = inet_checksum(&ns, ns_size, checksum);
        if(has_opt) {
                checksum = inet_checksum(&opt, opt_size, checksum);
@@ -637,7 +633,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 
        /* Generate checksum */
 
-       checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
+       checksum = inet_checksum(&pseudo, sizeof pseudo, ~0);
        checksum = inet_checksum(&ns, ns_size, checksum);
        if(has_opt) {
                checksum = inet_checksum(&opt, opt_size, checksum);
@@ -704,7 +700,7 @@ static void route_arp(node_t *source, vpn_packet_t *packet)
        /* Check if this is a valid ARP request */
 
        if(ntohs(arp.arp_hrd) != ARPHRD_ETHER || ntohs(arp.arp_pro) != ETH_P_IP ||
-          arp.arp_hln != ETH_ALEN || arp.arp_pln != sizeof(addr) || ntohs(arp.arp_op) != ARPOP_REQUEST) {
+          arp.arp_hln != ETH_ALEN || arp.arp_pln != sizeof addr || ntohs(arp.arp_op) != ARPOP_REQUEST) {
                ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: received unknown type ARP request"));
                return;
        }
@@ -728,9 +724,9 @@ static void route_arp(node_t *source, vpn_packet_t *packet)
        memcpy(packet->data, packet->data + ETH_ALEN, ETH_ALEN);        /* copy destination address */
        packet->data[ETH_ALEN * 2 - 1] ^= 0xFF; /* mangle source address so it looks like it's not from us */
 
-       memcpy(&addr, arp.arp_tpa, sizeof(addr));       /* save protocol addr */
-       memcpy(arp.arp_tpa, arp.arp_spa, sizeof(addr)); /* swap destination and source protocol address */
-       memcpy(arp.arp_spa, &addr, sizeof(addr));       /* ... */
+       memcpy(&addr, arp.arp_tpa, sizeof addr);        /* save protocol addr */
+       memcpy(arp.arp_tpa, arp.arp_spa, sizeof addr);  /* swap destination and source protocol address */
+       memcpy(arp.arp_spa, &addr, sizeof addr);        /* ... */
 
        memcpy(arp.arp_tha, arp.arp_sha, ETH_ALEN);     /* set target hard/proto addr */
        memcpy(arp.arp_sha, packet->data + ETH_ALEN, ETH_ALEN); /* add fake source hard addr */
@@ -743,6 +739,63 @@ static void route_arp(node_t *source, vpn_packet_t *packet)
        send_packet(source, packet);
 }
 
+static void route_mac(node_t *source, vpn_packet_t *packet)
+{
+       subnet_t *subnet;
+       mac_t dest;
+
+       cp();
+
+
+       /* Learn source address */
+
+       if(source == myself) {
+               mac_t src;
+               memcpy(&src, &packet->data[6], sizeof src);
+               learn_mac(&src);
+       }
+
+       /* Lookup destination address */
+
+       memcpy(&dest, &packet->data[0], sizeof dest);
+       subnet = lookup_subnet_mac(&dest);
+
+       if(!subnet) {
+               broadcast_packet(source, packet);
+               return;
+       }
+
+       if(subnet->owner == source) {
+               ifdebug(TRAFFIC) logger(LOG_WARNING, _("Packet looping back to %s (%s)!"), source->name, source->hostname);
+               return;
+       }
+
+       // Handle packets larger than PMTU
+
+       node_t *via = (subnet->owner->via == myself) ? subnet->owner->nexthop : subnet->owner->via;
+       
+       if(via && packet->len > via->mtu && via != myself) {
+               ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, via->mtu);
+               uint16_t type = packet->data[12] << 8 | packet->data[13];
+               if(type == ETH_P_IP) {
+                       if(packet->data[20] & 0x40) {
+                               packet->len = via->mtu;
+                               route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED);
+                       } else {
+                               fragment_ipv4_packet(via, packet);
+                       }
+                       return;
+               } else if(type == ETH_P_IPV6) {
+                       packet->len = via->mtu;
+                       route_ipv6_unreachable(source, packet, ICMP6_PACKET_TOO_BIG, 0);
+                       return;
+               }
+       }
+
+       send_packet(subnet->owner, packet);
+}
+
+
 void route(node_t *source, vpn_packet_t *packet)
 {
        cp();
@@ -753,9 +806,8 @@ void route(node_t *source, vpn_packet_t *packet)
        switch (routing_mode) {
                case RMODE_ROUTER:
                        {
-                               uint16_t type;
+                               uint16_t type = packet->data[12] << 8 | packet->data[13];
 
-                               type = ntohs(*((uint16_t *)(&packet->data[12])));
                                switch (type) {
                                        case ETH_P_ARP:
                                                route_arp(source, packet);