From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 26 Feb 2012 15:27:13 +0000 (+0100)
Subject: Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
X-Git-Tag: release-1.1pre3~145
X-Git-Url: https://www.tinc-vpn.org/git/browse?a=commitdiff_plain;h=483c5dcfb43719e5fd50902641252e28a04fd74e;hp=344d6b9ac3c795f2942e457c1ab38b1dac5f7242;p=tinc

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
---

diff --git a/src/net_packet.c b/src/net_packet.c
index 64b0f8e8..870f9858 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -139,7 +139,10 @@ static void send_mtu_probe_handler(int fd, short events, void *data) {
 		memset(packet.data, 0, 14);
 		randomize(packet.data + 14, len - 14);
 		packet.len = len;
-		packet.priority = i < 3 ? 0 : -1;
+		if(i >= 3 && n->mtuprobes <= 10)
+			packet.priority = -1;
+		else
+			packet.priority = 0;
 
 		ifdebug(TRAFFIC) logger(LOG_INFO, "Sending MTU probe length %d to %s (%s)", len, n->name, n->hostname);