diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-08-15 21:29:54 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-08-15 21:29:54 +0200 |
| commit | 7c229d538824cb679351220ad8911f7b2daa7c23 (patch) | |
| tree | 5c4d64b60da9018c7db3a9335a9787d326beade3 /src/openvpn/comp-lz4.c | |
| parent | d3986a312f5fbcfd0e78e6b147eef419fb4e5f54 (diff) | |
| parent | 1079962e4c06f88a54e50d997c1b7e84303d30b4 (diff) | |
Update upstream source from tag 'upstream/2.5_beta1'
Update to upstream version '2.5~beta1'
with Debian dir d53f9a482ac24eb491a294b26c24bb1d87afad24
Diffstat (limited to 'src/openvpn/comp-lz4.c')
| -rw-r--r-- | src/openvpn/comp-lz4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/openvpn/comp-lz4.c b/src/openvpn/comp-lz4.c index f2916bd..30e6da9 100644 --- a/src/openvpn/comp-lz4.c +++ b/src/openvpn/comp-lz4.c @@ -35,7 +35,7 @@ #if defined(NEED_COMPAT_LZ4) #include "compat-lz4.h" #else -#include "lz4.h" +#include <lz4.h> #endif #include "comp.h" @@ -70,8 +70,9 @@ do_lz4_compress(struct buffer *buf, { /* * In order to attempt compression, length must be at least COMPRESS_THRESHOLD. + * and asymmetric compression must be disabled */ - if (buf->len >= COMPRESS_THRESHOLD) + if (buf->len >= COMPRESS_THRESHOLD && (compctx->flags & COMP_F_ALLOW_COMPRESS)) { const size_t ps = PAYLOAD_SIZE(frame); int zlen_max = ps + COMP_EXTRA_BUFFER(ps); |