From: Etienne Dechamps <etienne@edechamps.fr>
Date: Sat, 20 Jul 2013 21:59:57 +0000 (+0100)
Subject: Disable PMTU discovery when TCPOnly is set.
X-Git-Tag: release-1.1pre8~22
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=e3a4672afb8eb341b380e74b2bf6d098f61c08a3

Disable PMTU discovery when TCPOnly is set.

Obviously, PMTU discovery doesn't make much sense when we know we'll be
using TCP anyway.
---

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 0eeddb86..a3cf3f51 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -386,7 +386,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 				update_node_udp(from, &sa);
 			}
 
-			if(from->options & OPTION_PMTU_DISCOVERY)
+			if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY))
 				send_mtu_probe(from);
 		}
 
@@ -435,7 +435,7 @@ bool ans_key_h(connection_t *c, const char *request) {
 		update_node_udp(from, &sa);
 	}
 
-	if(from->options & OPTION_PMTU_DISCOVERY)
+	if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY))
 		send_mtu_probe(from);
 
 	return true;