Merge remote-tracking branch 'VittGam/master'

[oweals/tinc.git] / src / route.c

diff --git a/src/route.c b/src/route.c
index bacfa626eda5ad8dcbfc1b860bde35d3ba255c01..50449897355ac97c28e1f24bf23adca247ec1023 100644 (file)
--- 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