X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=fd0c697d77b8d57d9603efd291f45f2072603ac7;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hp=42ae1fdf8ea196032ae9fe6016243bd0aed7a10f;hpb=e8b11b1cca11f7f50542a7b34f4251f43447db0d;p=tinc

diff --git a/src/route.c b/src/route.c
index 42ae1fdf..fd0c697d 100644
--- a/src/route.c
+++ b/src/route.c
@@ -1,7 +1,7 @@
 /*
     route.c -- routing
-    Copyright (C) 2000-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2000-2005 Ivo Timmermans,
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -13,16 +13,14 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "connection.h"
 #include "ethernet.h"
 #include "ipv4.h"
@@ -51,10 +49,11 @@ 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 __inline__ uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
-{
+static uint16_t inet_checksum(void *data, int len, uint16_t prevsum) {
 	uint16_t *p = data;
 	uint32_t checksum = prevsum ^ 0xFFFF;
 
@@ -72,9 +71,10 @@ static __inline__ uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
 	return ~checksum;
 }
 
-static __inline__ bool ratelimit(int frequency) {
+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)
@@ -87,57 +87,27 @@ static __inline__ bool ratelimit(int frequency) {
 	return false;
 }
 
-static __inline__ bool checklength(node_t *source, vpn_packet_t *packet, length_t length) {
+static bool checklength(node_t *source, vpn_packet_t *packet, length_t length) {
 	if(packet->len < length) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Got too short packet from %s (%s)"), source->name, source->hostname);
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Got too short packet from %s (%s)", source->name, source->hostname);
 		return false;
 	} else
 		return true;
 }
-	
-static __inline__ 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;
-
-	cp();
+	splay_node_t *node, *next, *node2;
+	bool left = false;
+	time_t now = time(NULL);
 
 	for(node = myself->subnet_tree->head; node; node = next) {
 		next = node->next;
@@ -146,7 +116,7 @@ void age_subnets(void)
 			ifdebug(TRAFFIC) {
 				char netstr[MAXNETSTR];
 				if(net2str(netstr, sizeof netstr, s))
-					logger(LOG_INFO, _("Subnet %s expired"), netstr);
+					logger(LOG_INFO, "Subnet %s expired", netstr);
 			}
 
 			for(node2 = connection_tree->head; node2; node2 = node2->next) {
@@ -156,42 +126,57 @@ 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 __inline__ void route_mac(node_t *source, vpn_packet_t *packet)
+static void learn_mac(mac_t *address)
 {
 	subnet_t *subnet;
+	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)
-		learn_mac((mac_t *)(&packet->data[6]));
+	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);
 
-	subnet = lookup_subnet_mac((mac_t *)(&packet->data[0]));
+		/* 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 */
 
-static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t type, uint8_t code)
-{
+static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t type, uint8_t code) {
 	struct ip ip = {0};
 	struct icmp icmp = {0};
 	
@@ -202,7 +187,9 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
 	if(ratelimit(3))
 		return;
 	
-	cp();
+	/* Swap Ethernet source and destination addresses */
+
+	swap_mac_addresses(packet);
 
 	/* Copy headers from packet into properly aligned structs on the stack */
 
@@ -262,15 +249,13 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
 
 /* RFC 791 */
 
-static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) {
+static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) {
 	struct ip ip;
 	vpn_packet_t fragment;
 	int len, maxlen, todo;
 	uint8_t *offset;
 	uint16_t ip_off, origf;
 	
-	cp();
-
 	memcpy(&ip, packet->data + ether_size, ip_size);
 	fragment.priority = packet->priority;
 
@@ -280,11 +265,11 @@ static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet)
 	todo = ntohs(ip.ip_len) - ip_size;
 
 	if(ether_size + ip_size + todo != packet->len) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Length of packet (%d) doesn't match length in IPv4 header (%d)"), packet->len, ether_size + ip_size + todo);
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Length of packet (%d) doesn't match length in IPv4 header (%zd)", packet->len, ether_size + ip_size + todo);
 		return;
 	}
 
-	ifdebug(TRAFFIC) logger(LOG_INFO, _("Fragmenting packet of %d bytes to %s (%s)"), packet->len, dest->name, dest->hostname);
+	ifdebug(TRAFFIC) logger(LOG_INFO, "Fragmenting packet of %d bytes to %s (%s)", packet->len, dest->name, dest->hostname);
 
 	offset = packet->data + ether_size + ip_size;
 	maxlen = (dest->mtu - ether_size - ip_size) & ~0x7;
@@ -312,29 +297,28 @@ static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet)
 	}	
 }
 
-static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
-{
+static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) {
 	subnet_t *subnet;
 	node_t *via;
+	ipv4_t dest;
 
-	cp();
-
-	subnet = lookup_subnet_ipv4((ipv4_t *) &packet->data[30]);
+	memcpy(&dest, &packet->data[30], sizeof dest);
+	subnet = lookup_subnet_ipv4(&dest);
 
 	if(!subnet) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown IPv4 destination address %d.%d.%d.%d"),
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Cannot route packet from %s (%s): unknown IPv4 destination address %d.%d.%d.%d",
 				source->name, source->hostname,
-				packet->data[30],
-				packet->data[31],
-				packet->data[32],
-				packet->data[33]);
+				dest.x[0],
+				dest.x[1],
+				dest.x[2],
+				dest.x[3]);
 
 		route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_NET_UNKNOWN);
 		return;
 	}
 	
 	if(subnet->owner == source) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Packet looping back to %s (%s)!"), source->name, source->hostname);
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Packet looping back to %s (%s)!", source->name, source->hostname);
 		return;
 	}
 
@@ -347,7 +331,7 @@ static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
 	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);
+		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);
 		if(packet->data[20] & 0x40) {
 			packet->len = via->mtu;
 			route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED);
@@ -361,20 +345,23 @@ static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
 	send_packet(subnet->owner, packet);
 }
 
-static __inline__ void route_ipv4(node_t *source, vpn_packet_t *packet)
-{
-	cp();
-
+static void route_ipv4(node_t *source, vpn_packet_t *packet) {
 	if(!checklength(source, packet, ether_size + ip_size))
 		return;
 
-	route_ipv4_unicast(source, packet);
+	if(((packet->data[30] & 0xf0) == 0xe0) || (
+			packet->data[30] == 255 &&
+			packet->data[31] == 255 &&
+			packet->data[32] == 255 &&
+			packet->data[33] == 255))
+		broadcast_packet(source, packet);
+	else
+		route_ipv4_unicast(source, packet);
 }
 
 /* RFC 2463 */
 
-static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t type, uint8_t code)
-{
+static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t type, uint8_t code) {
 	struct ip6_hdr ip6;
 	struct icmp6_hdr icmp6 = {0};
 	uint16_t checksum;	
@@ -389,7 +376,9 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
 	if(ratelimit(3))
 		return;
 	
-	cp();
+	/* Swap Ethernet source and destination addresses */
+
+	swap_mac_addresses(packet);
 
 	/* Copy headers from packet to structs on the stack */
 
@@ -434,7 +423,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);
 
@@ -450,33 +439,32 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
 	send_packet(source, packet);
 }
 
-static __inline__ void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
-{
+static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) {
 	subnet_t *subnet;
 	node_t *via;
+	ipv6_t dest;
 
-	cp();
-
-	subnet = lookup_subnet_ipv6((ipv6_t *) &packet->data[38]);
+	memcpy(&dest, &packet->data[38], sizeof dest);
+	subnet = lookup_subnet_ipv6(&dest);
 
 	if(!subnet) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"),
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Cannot route packet from %s (%s): unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
 				source->name, source->hostname,
-				ntohs(*(uint16_t *) &packet->data[38]),
-				ntohs(*(uint16_t *) &packet->data[40]),
-				ntohs(*(uint16_t *) &packet->data[42]),
-				ntohs(*(uint16_t *) &packet->data[44]),
-				ntohs(*(uint16_t *) &packet->data[46]),
-				ntohs(*(uint16_t *) &packet->data[48]),
-				ntohs(*(uint16_t *) &packet->data[50]),
-				ntohs(*(uint16_t *) &packet->data[52]));
+				ntohs(dest.x[0]),
+				ntohs(dest.x[1]),
+				ntohs(dest.x[2]),
+				ntohs(dest.x[3]),
+				ntohs(dest.x[4]),
+				ntohs(dest.x[5]),
+				ntohs(dest.x[6]),
+				ntohs(dest.x[7]));
 
 		route_ipv6_unreachable(source, packet, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR);
 		return;
 	}
 
 	if(subnet->owner == source) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Packet looping back to %s (%s)!"), source->name, source->hostname);
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Packet looping back to %s (%s)!", source->name, source->hostname);
 		return;
 	}
 
@@ -486,7 +474,7 @@ static __inline__ void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
 	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);
+		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);
 		packet->len = via->mtu;
 		route_ipv6_unreachable(source, packet, ICMP6_PACKET_TOO_BIG, 0);
 		return;
@@ -497,13 +485,13 @@ static __inline__ void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
 
 /* RFC 2461 */
 
-static void route_neighborsol(node_t *source, vpn_packet_t *packet)
-{
+static void route_neighborsol(node_t *source, vpn_packet_t *packet) {
 	struct ip6_hdr ip6;
 	struct nd_neighbor_solicit ns;
 	struct nd_opt_hdr opt;
 	subnet_t *subnet;
 	uint16_t checksum;
+	bool has_opt;
 
 	struct {
 		struct in6_addr ip6_src;	/* source address */
@@ -512,13 +500,13 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 		uint32_t next;
 	} pseudo;
 
-	cp();
-
-	if(!checklength(source, packet, ether_size + ip6_size + ns_size + opt_size + ETH_ALEN))
+	if(!checklength(source, packet, ether_size + ip6_size + ns_size))
 		return;
 	
+	has_opt = packet->len >= ether_size + ip6_size + ns_size + opt_size + ETH_ALEN;
+	
 	if(source != myself) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Got neighbor solicitation request from %s (%s) while in router mode!"), source->name, source->hostname);
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Got neighbor solicitation request from %s (%s) while in router mode!", source->name, source->hostname);
 		return;
 	}
 
@@ -526,7 +514,8 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 
 	memcpy(&ip6, packet->data + ether_size, ip6_size);
 	memcpy(&ns, packet->data + ether_size + ip6_size, ns_size);
-	memcpy(&opt, packet->data + ether_size + ip6_size + ns_size, opt_size);
+	if(has_opt)
+		memcpy(&opt, packet->data + ether_size + ip6_size + ns_size, opt_size);
 
 	/* First, snatch the source address from the neighbor solicitation packet */
 
@@ -536,8 +525,8 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 	/* Check if this is a valid neighbor solicitation request */
 
 	if(ns.nd_ns_hdr.icmp6_type != ND_NEIGHBOR_SOLICIT ||
-	   opt.nd_opt_type != ND_OPT_SOURCE_LINKADDR) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: received unknown type neighbor solicitation request"));
+	   (has_opt && opt.nd_opt_type != ND_OPT_SOURCE_LINKADDR)) {
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Cannot route packet: received unknown type neighbor solicitation request");
 		return;
 	}
 
@@ -545,18 +534,23 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 
 	pseudo.ip6_src = ip6.ip6_src;
 	pseudo.ip6_dst = ip6.ip6_dst;
-	pseudo.length = htonl(ns_size + opt_size + ETH_ALEN);
+	if(has_opt)
+		pseudo.length = htonl(ns_size + opt_size + ETH_ALEN);
+	else
+		pseudo.length = htonl(ns_size);
 	pseudo.next = htonl(IPPROTO_ICMPV6);
 
 	/* Generate checksum */
 
-	checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
+	checksum = inet_checksum(&pseudo, sizeof pseudo, ~0);
 	checksum = inet_checksum(&ns, ns_size, checksum);
-	checksum = inet_checksum(&opt, opt_size, checksum);
-	checksum = inet_checksum(packet->data + ether_size + ip6_size + ns_size + opt_size, ETH_ALEN, checksum);
+	if(has_opt) {
+		checksum = inet_checksum(&opt, opt_size, checksum);
+		checksum = inet_checksum(packet->data + ether_size + ip6_size + ns_size + opt_size, ETH_ALEN, checksum);
+	}
 
 	if(checksum) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: checksum error for neighbor solicitation request"));
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Cannot route packet: checksum error for neighbor solicitation request");
 		return;
 	}
 
@@ -565,7 +559,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 	subnet = lookup_subnet_ipv6((ipv6_t *) &ns.nd_ns_target);
 
 	if(!subnet) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: neighbor solicitation request for unknown address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"),
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Cannot route packet: neighbor solicitation request for unknown address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
 				   ntohs(((uint16_t *) &ns.nd_ns_target)[0]),
 				   ntohs(((uint16_t *) &ns.nd_ns_target)[1]),
 				   ntohs(((uint16_t *) &ns.nd_ns_target)[2]),
@@ -591,7 +585,8 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 	ip6.ip6_dst = ip6.ip6_src;			/* swap destination and source protocoll address */
 	ip6.ip6_src = ns.nd_ns_target;
 
-	memcpy(packet->data + ether_size + ip6_size + ns_size + opt_size, packet->data + ETH_ALEN, ETH_ALEN);	/* add fake source hard addr */
+	if(has_opt)
+		memcpy(packet->data + ether_size + ip6_size + ns_size + opt_size, packet->data + ETH_ALEN, ETH_ALEN);	/* add fake source hard addr */
 
 	ns.nd_ns_cksum = 0;
 	ns.nd_ns_type = ND_NEIGHBOR_ADVERT;
@@ -602,15 +597,20 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 
 	pseudo.ip6_src = ip6.ip6_src;
 	pseudo.ip6_dst = ip6.ip6_dst;
-	pseudo.length = htonl(ns_size + opt_size + ETH_ALEN);
+	if(has_opt)
+		pseudo.length = htonl(ns_size + opt_size + ETH_ALEN);
+	else
+		pseudo.length = htonl(ns_size);
 	pseudo.next = htonl(IPPROTO_ICMPV6);
 
 	/* Generate checksum */
 
-	checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
+	checksum = inet_checksum(&pseudo, sizeof pseudo, ~0);
 	checksum = inet_checksum(&ns, ns_size, checksum);
-	checksum = inet_checksum(&opt, opt_size, checksum);
-	checksum = inet_checksum(packet->data + ether_size + ip6_size + ns_size + opt_size, ETH_ALEN, checksum);
+	if(has_opt) {
+		checksum = inet_checksum(&opt, opt_size, checksum);
+		checksum = inet_checksum(packet->data + ether_size + ip6_size + ns_size + opt_size, ETH_ALEN, checksum);
+	}
 
 	ns.nd_ns_hdr.icmp6_cksum = checksum;
 
@@ -618,15 +618,13 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
 
 	memcpy(packet->data + ether_size, &ip6, ip6_size);
 	memcpy(packet->data + ether_size + ip6_size, &ns, ns_size);
-	memcpy(packet->data + ether_size + ip6_size + ns_size, &opt, opt_size);
+	if(has_opt)
+		memcpy(packet->data + ether_size + ip6_size + ns_size, &opt, opt_size);
 
 	send_packet(source, packet);
 }
 
-static __inline__ void route_ipv6(node_t *source, vpn_packet_t *packet)
-{
-	cp();
-
+static void route_ipv6(node_t *source, vpn_packet_t *packet) {
 	if(!checklength(source, packet, ether_size + ip6_size))
 		return;
 
@@ -635,24 +633,24 @@ static __inline__ void route_ipv6(node_t *source, vpn_packet_t *packet)
 		return;
 	}
 
-	route_ipv6_unicast(source, packet);
+	if(packet->data[38] == 255)
+		broadcast_packet(source, packet);
+	else
+		route_ipv6_unicast(source, packet);
 }
 
 /* RFC 826 */
 
-static void route_arp(node_t *source, vpn_packet_t *packet)
-{
+static void route_arp(node_t *source, vpn_packet_t *packet) {
 	struct ether_arp arp;
 	subnet_t *subnet;
 	struct in_addr addr;
 
-	cp();
-
 	if(!checklength(source, packet, ether_size + arp_size))
 		return;
 
 	if(source != myself) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Got ARP request from %s (%s) while in router mode!"), source->name, source->hostname);
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Got ARP request from %s (%s) while in router mode!", source->name, source->hostname);
 		return;
 	}
 
@@ -668,8 +666,8 @@ 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) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: received unknown type ARP 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;
 	}
 
@@ -678,7 +676,7 @@ static void route_arp(node_t *source, vpn_packet_t *packet)
 	subnet = lookup_subnet_ipv4((ipv4_t *) &arp.arp_tpa);
 
 	if(!subnet) {
-		ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: ARP request for unknown address %d.%d.%d.%d"),
+		ifdebug(TRAFFIC) logger(LOG_WARNING, "Cannot route packet: ARP request for unknown address %d.%d.%d.%d",
 				   arp.arp_tpa[0], arp.arp_tpa[1], arp.arp_tpa[2],
 				   arp.arp_tpa[3]);
 		return;
@@ -692,9 +690,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 */
@@ -707,19 +705,67 @@ static void route_arp(node_t *source, vpn_packet_t *packet)
 	send_packet(source, packet);
 }
 
-void route(node_t *source, vpn_packet_t *packet)
-{
-	cp();
+static void route_mac(node_t *source, vpn_packet_t *packet) {
+	subnet_t *subnet;
+	mac_t dest;
+
+	/* 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) {
 	if(!checklength(source, packet, ether_size))
 		return;
 
 	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);
@@ -734,7 +780,7 @@ void route(node_t *source, vpn_packet_t *packet)
 						break;
 
 					default:
-						ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown type %hx"), source->name, source->hostname, type);
+						ifdebug(TRAFFIC) logger(LOG_WARNING, "Cannot route packet from %s (%s): unknown type %hx", source->name, source->hostname, type);
 						break;
 				}
 			}