From 1e2485a1c0c5b7497d1384d719a2d2a2dc8757ce Mon Sep 17 00:00:00 2001 From: "Vittorio Gambaletta (VittGam)" Date: Wed, 12 Oct 2016 14:09:34 +0200 Subject: [PATCH] route: Support ToS/DiffServ priority inheritance when routing IPv6 packets. Signed-off-by: Vittorio Gambaletta --- src/route.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/route.c b/src/route.c index bacfa626..50449897 100644 --- a/src/route.c +++ b/src/route.c @@ -675,6 +675,9 @@ static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) { if(!do_decrement_ttl(source, packet)) return; + if(priorityinheritance) + packet->priority = ((packet->data[14] & 0x0f) << 4) | (packet->data[15] >> 4); + via = (subnet->owner->via == myself) ? subnet->owner->nexthop : subnet->owner->via; if(via == source) { @@ -963,8 +966,12 @@ static void route_mac(node_t *source, vpn_packet_t *packet) { uint16_t type = packet->data[12] << 8 | packet->data[13]; - if(priorityinheritance && type == ETH_P_IP && packet->len >= ether_size + ip_size) - packet->priority = packet->data[15]; + if(priorityinheritance) { + if(type == ETH_P_IP && packet->len >= ether_size + ip_size) + packet->priority = packet->data[15]; + else if(type == ETH_P_IPV6 && packet->len >= ether_size + ip6_size) + packet->priority = ((packet->data[14] & 0x0f) << 4) | (packet->data[15] >> 4); + } // Handle packets larger than PMTU -- 2.20.1