From: Arne Schwabe Date: Sun, 14 Nov 2021 13:03:11 +0000 (+0100) Subject: Move IV_TCPNL from comp_generate_peer_info_string to push_peer_info X-Git-Tag: v2.6_beta1~381 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=648e871e50e76586d65a267cf598d8f1ec0d0057;p=thirdparty%2Fopenvpn.git 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 Acked-by: Gert Doering 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 --- diff --git a/src/openvpn/comp.c b/src/openvpn/comp.c index 72b1511ea..ad49b00b9 100644 --- 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 9f7b677ec..ad3e08274 100644 --- 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 */