Commit 8fa8a17528c001a introduces "compress migrate" to move old clients
that have "compress" or "comp-lzo" in their config towards a connection
without compression. This is done by looking at incoming OCC strings
to see if the client has compression enabled, and at incoming IV_
strings to see whether it can do "compress stub-v2" or needs to be sent
"comp-lzo no".
That check fails for 2.2 clients that do not send *any* peer-info by
default, so the server will not push back any "disable compression"
command. It works if the client connects with "--push-peer-info".
Fix: turn around the order of checks, treat "no peer_info" the same
as "peer_info does not contain IV_COMP_STUBv2".
Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
src/openvpn/multi.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 5c495036..56b4fc0d 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -2485,14 +2485,9 @@ multi_client_connect_compress_migrate(struct
multi_context *m,
struct options *o = &mi->context.options;
const char *const peer_info = mi->context.c2.tls_multi->peer_info;
- if (!peer_info)
- {
- return CC_RET_SUCCEEDED;
- }
-
if (o->comp.flags & COMP_F_MIGRATE &&
mi->context.c2.tls_multi->remote_usescomp)
{
- if(strstr(peer_info, "IV_COMP_STUBv2=1"))
+ if(peer_info && strstr(peer_info, "IV_COMP_STUBv2=1"))
{
push_option(o, "compress stub-v2", M_USAGE);
}
--
2.26.3
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
