From: Guus Sliepen <guus@tinc-vpn.org>
Date: Tue, 21 Mar 2017 20:48:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'VittGam/master'
X-Git-Tag: release-1.0.32~11
X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=commitdiff_plain;h=07ace0b6481efcc0a058aab7b90b95edd31709da;hp=5c344f297682cf11793407fca4547968aee22d95

Merge remote-tracking branch 'VittGam/master'
---

diff --git a/src/route.c b/src/route.c
index bacfa62..5044989 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