summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/openvpn/Makefile.am2
-rw-r--r--src/openvpn/forward.c4
-rw-r--r--src/openvpn/init.c14
-rw-r--r--src/openvpn/lzo.c4
-rw-r--r--src/openvpn/lzo.h13
-rw-r--r--src/openvpn/openvpn.h4
-rw-r--r--src/openvpn/options.c18
-rw-r--r--src/openvpn/options.h2
-rw-r--r--src/openvpn/sig.c2
9 files changed, 36 insertions, 27 deletions
diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am
index fd92225..ca2804d 100644
--- a/src/openvpn/Makefile.am
+++ b/src/openvpn/Makefile.am
@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = \
INCLUDES = -I$(top_srcdir)/include
AM_CFLAGS = \
+ $(OPTIONAL_LZO_CFLAGS) \
$(OPTIONAL_PKCS11_HELPER_CFLAGS)
sbin_PROGRAMS = openvpn
@@ -100,6 +101,7 @@ openvpn_SOURCES = \
cryptoapi.h cryptoapi.c
openvpn_LDADD = \
$(SOCKETS_LIBS) \
+ $(OPTIONAL_LZO_LIBS) \
$(OPTIONAL_PKCS11_HELPER_LIBS) \
$(OPTIONAL_SELINUX_LIBS) \
$(OPTIONAL_DL_LIBS)
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index ace7d2a..46bbfe7 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -438,7 +438,7 @@ encrypt_sign (struct context *c, bool comp_frag)
if (comp_frag)
{
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
/* Compress the packet. */
if (lzo_defined (&c->c2.lzo_compwork))
lzo_compress (&c->c2.buf, b->lzo_compress_buf, &c->c2.lzo_compwork, &c->c2.frame);
@@ -840,7 +840,7 @@ process_incoming_link (struct context *c)
fragment_incoming (c->c2.fragment, &c->c2.buf, &c->c2.frame_fragment);
#endif
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
/* decompress the incoming packet */
if (lzo_defined (&c->c2.lzo_compwork))
lzo_decompress (&c->c2.buf, c->c2.buffers->lzo_decompress_buf, &c->c2.lzo_compwork, &c->c2.frame);
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 0c995ff..766e498 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -1789,7 +1789,7 @@ do_deferred_options (struct context *c, const unsigned int found)
}
#endif
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
if (found & OPT_P_COMP)
{
if (lzo_defined (&c->c2.lzo_compwork))
@@ -2370,7 +2370,7 @@ do_init_crypto (struct context *c, const unsigned int flags)
static void
do_init_frame (struct context *c)
{
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
/*
* Initialize LZO compression library.
*/
@@ -2393,7 +2393,7 @@ do_init_frame (struct context *c)
lzo_adjust_frame_parameters (&c->c2.frame_fragment_omit); /* omit LZO frame delta from final frame_fragment */
#endif
}
-#endif /* USE_LZO */
+#endif /* ENABLE_LZO */
#ifdef ENABLE_SOCKS
/*
@@ -2564,7 +2564,7 @@ init_context_buffers (const struct frame *frame)
b->decrypt_buf = alloc_buf (BUF_SIZE (frame));
#endif
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
b->lzo_compress_buf = alloc_buf (BUF_SIZE (frame));
b->lzo_decompress_buf = alloc_buf (BUF_SIZE (frame));
#endif
@@ -2581,7 +2581,7 @@ free_context_buffers (struct context_buffers *b)
free_buf (&b->read_tun_buf);
free_buf (&b->aux_buf);
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
free_buf (&b->lzo_compress_buf);
free_buf (&b->lzo_decompress_buf);
#endif
@@ -3419,7 +3419,7 @@ init_instance (struct context *c, const struct env_set *env, const unsigned int
goto sig;
}
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
/* initialize LZO compression library. */
if ((options->lzo & LZO_SELECTED) && (c->mode == CM_P2P || child))
lzo_compress_init (&c->c2.lzo_compwork, options->lzo);
@@ -3536,7 +3536,7 @@ close_instance (struct context *c)
/* if xinetd/inetd mode, don't allow restart */
do_close_check_if_restart_permitted (c);
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
if (lzo_defined (&c->c2.lzo_compwork))
lzo_compress_uninit (&c->c2.lzo_compwork);
#endif
diff --git a/src/openvpn/lzo.c b/src/openvpn/lzo.c
index ca06f71..4becd4d 100644
--- a/src/openvpn/lzo.c
+++ b/src/openvpn/lzo.c
@@ -28,7 +28,7 @@
#include "syshead.h"
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
#include "lzo.h"
#include "error.h"
@@ -301,4 +301,4 @@ void lzo_print_stats (const struct lzo_compress_workspace *lzo_compwork, struct
#else
static void dummy(void) {}
-#endif /* USE_LZO */
+#endif /* ENABLE_LZO */
diff --git a/src/openvpn/lzo.h b/src/openvpn/lzo.h
index da4bd88..472204d 100644
--- a/src/openvpn/lzo.h
+++ b/src/openvpn/lzo.h
@@ -32,7 +32,7 @@
*/
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
/**
* @addtogroup compression
@@ -40,11 +40,14 @@
*/
#ifndef ENABLE_LZO_STUB
-#ifdef LZO_HEADER_DIR
+#if defined(HAVE_LZO_LZOUTIL_H)
#include "lzo/lzoutil.h"
-#include "lzo/lzo1x.h"
-#else
+#elif defined(HAVE_LZOUTIL_H)
#include "lzoutil.h"
+#endif
+#if defined(HAVE_LZO_LZO1X_H)
+#include "lzo/lzo1x.h"
+#elif defined(HAVE_LZO1X_H)
#include "lzo1x.h"
#endif
#endif
@@ -340,5 +343,5 @@ lzo_defined (const struct lzo_compress_workspace *lzowork)
/** @} addtogroup compression */
-#endif /* USE_LZO */
+#endif /* ENABLE_LZO */
#endif
diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h
index a07b03f..5af422e 100644
--- a/src/openvpn/openvpn.h
+++ b/src/openvpn/openvpn.h
@@ -105,7 +105,7 @@ struct context_buffers
#endif
/* workspace buffers for LZO compression */
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
struct buffer lzo_compress_buf;
struct buffer lzo_decompress_buf;
#endif
@@ -372,7 +372,7 @@ struct context_2
#endif /* USE_CRYPTO */
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
struct lzo_compress_workspace lzo_compwork;
/**< Compression workspace used by the
* \link compression Data Channel
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 4e95b83..12f46c7 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -75,8 +75,12 @@ const char title_string[] =
#endif /* defined(USE_POLARSSL) */
#endif /* USE_SSL */
#endif /* USE_CRYPTO */
-#ifdef USE_LZO
- " [LZO" LZO_VERSION_NUM "]"
+#ifdef ENABLE_LZO
+#ifdef ENABLE_LZO_STUB
+ " [LZO (STUB)]"
+#else
+ " [LZO]"
+#endif
#endif
#if EPOLL
" [EPOLL]"
@@ -354,7 +358,7 @@ static const char usage_message[] =
#ifdef ENABLE_DEBUG
"--gremlin mask : Special stress testing mode (for debugging only).\n"
#endif
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
"--comp-lzo : Use fast LZO compression -- may add up to 1 byte per\n"
" packet for uncompressible data.\n"
"--comp-noadapt : Don't use adaptive compression when --comp-lzo\n"
@@ -1512,7 +1516,7 @@ show_settings (const struct options *o)
SHOW_BOOL (fast_io);
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
SHOW_INT (lzo);
#endif
@@ -2954,7 +2958,7 @@ options_string (const struct options *o,
tt = NULL;
}
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
if (o->lzo & LZO_SELECTED)
buf_printf (&out, ",comp-lzo");
#endif
@@ -6180,7 +6184,7 @@ add_option (struct options *options,
options->passtos = true;
}
#endif
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
else if (streq (p[0], "comp-lzo"))
{
VERIFY_PERMISSION (OPT_P_COMP);
@@ -6206,7 +6210,7 @@ add_option (struct options *options,
VERIFY_PERMISSION (OPT_P_COMP);
options->lzo &= ~LZO_ADAPTIVE;
}
-#endif /* USE_LZO */
+#endif /* ENABLE_LZO */
#ifdef USE_CRYPTO
else if (streq (p[0], "show-ciphers"))
{
diff --git a/src/openvpn/options.h b/src/openvpn/options.h
index 57b88b7..87fea48 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/options.h
@@ -343,7 +343,7 @@ struct options
/* optimize TUN/TAP/UDP writes */
bool fast_io;
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
/* LZO_x flags from lzo.h */
unsigned int lzo;
#endif
diff --git a/src/openvpn/sig.c b/src/openvpn/sig.c
index 33958b0..231f676 100644
--- a/src/openvpn/sig.c
+++ b/src/openvpn/sig.c
@@ -259,7 +259,7 @@ print_status (const struct context *c, struct status_output *so)
status_printf (so, "TCP/UDP read bytes," counter_format, c->c2.link_read_bytes);
status_printf (so, "TCP/UDP write bytes," counter_format, c->c2.link_write_bytes);
status_printf (so, "Auth read bytes," counter_format, c->c2.link_read_bytes_auth);
-#ifdef USE_LZO
+#ifdef ENABLE_LZO
if (lzo_defined (&c->c2.lzo_compwork))
lzo_print_stats (&c->c2.lzo_compwork, so);
#endif
generated by cgit (git 2.34.1) at 2024-06-08 02:02:09 +0000