Disable PMTU discovery when TCPOnly is used.
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 23 Oct 2017 19:10:20 +0000 (21:10 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 23 Oct 2017 19:10:20 +0000 (21:10 +0200)
src/net_setup.c
src/protocol_auth.c

index 17c0425..8eb3e60 100644 (file)
@@ -588,7 +588,7 @@ static bool setup_myself(void) {
                free(mode);
        }
 
                free(mode);
        }
 
-       choice = true;
+       choice = !(myself->options & OPTION_TCPONLY);
        get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
 
        if(choice) {
        get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
 
        if(choice) {
index 0d21be0..6d1435b 100644 (file)
@@ -520,7 +520,7 @@ bool send_ack(connection_t *c) {
                c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
        }
 
                c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
        }
 
-       if(myself->options & OPTION_PMTU_DISCOVERY) {
+       if(myself->options & OPTION_PMTU_DISCOVERY && !(c->options & OPTION_TCPONLY)) {
                c->options |= OPTION_PMTU_DISCOVERY;
        }
 
                c->options |= OPTION_PMTU_DISCOVERY;
        }