From: James Yonan <ja...@openvpn.net>
OpenVPN SVN r8219, slightly adapted for conflicts brought in by
commit f0e8997a874a89b3 (IPv6 MSSFIX implementation).
Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
src/openvpn/forward.c | 6 +-----
src/openvpn/forward.h | 4 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index 447b86d..8f1f1e5 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -1026,11 +1026,7 @@ process_ip_header (struct context *c, unsigned int
flags, struct buffer *buf)
* The --passtos and --mssfix options require
* us to examine the IPv4 header.
*/
-#if PASSTOS_CAPABILITY
- if (flags & (PIPV4_PASSTOS|PIP_MSSFIX))
-#else
- if (flags & PIP_MSSFIX)
-#endif
+ if (flags & PIP_OPT_MASK)
{
struct buffer ipbuf = *buf;
if (is_ipv4 (TUNNEL_TYPE (c->c1.tuntap), &ipbuf))
diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h
index 1830a00..0ece01e 100644
--- a/src/openvpn/forward.h
+++ b/src/openvpn/forward.h
@@ -229,9 +229,11 @@ bool send_control_channel_string (struct context *c, const
char *str, int msglev
#define PIPV4_PASSTOS (1<<0)
#define PIP_MSSFIX (1<<1) /* v4 and v6 */
-#define PIPV4_OUTGOING (1<<2)
#define PIPV4_EXTRACT_DHCP_ROUTER (1<<3)
#define PIPV4_CLIENT_NAT (1<<4)
+#define PIP_OPT_MASK 0xFFFF /* all possible options for */
+ /* process_ip_header() */
+#define PIPV4_OUTGOING (1<<16)
void process_ip_header (struct context *c, unsigned int flags, struct buffer
*buf);
--
1.8.1.5
