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://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=483c5dcfb43719e5fd50902641252e28a04fd74e;p=tinc

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

483c5dcfb43719e5fd50902641252e28a04fd74e
diff --cc src/net_packet.c
index 64b0f8e8,4b3496d3..870f9858
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@@ -137,9 -136,12 +137,12 @@@ static void send_mtu_probe_handler(int 
  			len = 64;
  		
  		memset(packet.data, 0, 14);
 -		RAND_pseudo_bytes(packet.data + 14, len - 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);