Move IV_TCPNL from comp_generate_peer_info_string to push_peer_info

This IV variable has nothing to do with compression and should not
depend if OpenVPN is compiled with USE_COMP. So move it to the
other generic IV variables.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20211114130311.4043536-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23182.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/src/openvpn/comp.c b/src/openvpn/comp.c
index 72b1511ea938ba026084b80106abba29c6fd7075..ad49b00b90aac2db66be296e76b6013d21b715e7 100644 (file)
--- a/src/openvpn/comp.c
+++ b/src/openvpn/comp.c
@@ -169,7 +169,6 @@ comp_generate_peer_info_string(const struct compress_options *opt, struct buffer
         }
         buf_printf(out, "IV_COMP_STUB=1\n");
         buf_printf(out, "IV_COMP_STUBv2=1\n");
-        buf_printf(out, "IV_TCPNL=1\n");
     }
 }
 

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 9f7b677ecb9dcdc2dd4301f06e04bc784ecd8dc6..ad3e082746bc8fe93814f65cc85db608aa8b32a1 100644 (file)
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -2176,6 +2176,9 @@ push_peer_info(struct buffer *buf, struct tls_session *session)
 #elif defined(_WIN32)
         buf_printf(&out, "IV_PLAT=win\n");
 #endif
+        /* Announce that we do not require strict sequence numbers with
+         * TCP. (TCP non-linear) */
+        buf_printf(&out, "IV_TCPNL=1\n");
     }
 
     /* These are the IV variable that are sent to peers in p2p mode */