From: Guus Sliepen Date: Sun, 20 Jan 2013 14:16:13 +0000 (+0100) Subject: Make sure PriorityInheritance also works in switch mode. X-Git-Tag: release-1.1pre5~3 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=1be7dc759a64d436fd7586aad43b545f2dc665b5;p=tinc Make sure PriorityInheritance also works in switch mode. Conflicts: src/route.c --- diff --git a/src/route.c b/src/route.c index 7bb99961..1d0c6f8a 100644 --- a/src/route.c +++ b/src/route.c @@ -835,6 +835,11 @@ static void route_mac(node_t *source, vpn_packet_t *packet) { if(forwarding_mode == FMODE_OFF && source != myself && subnet->owner != myself) return; + 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]; + // Handle packets larger than PMTU node_t *via = (subnet->owner->via == myself) ? subnet->owner->nexthop : subnet->owner->via; @@ -844,7 +849,6 @@ static void route_mac(node_t *source, vpn_packet_t *packet) { if(via && packet->len > via->mtu && via != myself) { logger(DEBUG_TRAFFIC, 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]; length_t ethlen = 14; if(type == ETH_P_8021Q) {