From: James Yonan <james@openvpn.net>
Date: gio, 20 set 2012 23:32:12 +0300
Subject: [PATCH] Minor fix to process_ipv4_header so that any combination of options
can be defined.
---
a
|
b
|
|
1029 | 1029 | * The --passtos and --mssfix options require |
1030 | 1030 | * us to examine the IPv4 header. |
1031 | 1031 | */ |
1032 | | #if PASSTOS_CAPABILITY |
1033 | | if (flags & (PIPV4_PASSTOS|PIPV4_MSSFIX)) |
1034 | | #else |
1035 | | if (flags & PIPV4_MSSFIX) |
1036 | | #endif |
| 1032 | if (flags & PIPV4_OPT_MASK) |
1037 | 1033 | { |
1038 | | struct buffer ipbuf = *buf; |
1039 | | if (is_ipv4 (TUNNEL_TYPE (c->c1.tuntap), &ipbuf)) |
| 1034 | if (is_ipv4 (TUNNEL_TYPE (c->c1.tuntap), buf)) |
1040 | 1035 | { |
| 1036 | struct buffer ipbuf = *buf; |
1041 | 1037 | #if PASSTOS_CAPABILITY |
1042 | 1038 | /* extract TOS from IP header */ |
1043 | 1039 | if (flags & PIPV4_PASSTOS) |