diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2014-09-02 12:20:00 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2014-09-02 12:20:00 +0200 |
| commit | c1db7b69b6d1d4da34995b32cfd78172d5d015c4 (patch) | |
| tree | cf2a6cf09c8487f58e19f8ffe72e48cda7deccc6 /src/openvpn/proto.c | |
| parent | dc7b942f8f182eb26054299fab3b87c6342361fe (diff) | |
| parent | 809daf3b371e0c2457b5d4bd414382eb67bf8348 (diff) | |
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'src/openvpn/proto.c')
| -rw-r--r-- | src/openvpn/proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvpn/proto.c b/src/openvpn/proto.c index b437f1a..7b58e6a 100644 --- a/src/openvpn/proto.c +++ b/src/openvpn/proto.c @@ -60,7 +60,7 @@ is_ipv_X ( int tunnel_type, struct buffer *buf, int ip_ver ) + sizeof (struct openvpn_iphdr))) return false; eh = (const struct openvpn_ethhdr *) BPTR (buf); - if (ntohs (eh->proto) != OPENVPN_ETH_P_IPV4) + if (ntohs (eh->proto) != (ip_ver == 6 ? OPENVPN_ETH_P_IPV6 : OPENVPN_ETH_P_IPV4)) return false; offset = sizeof (struct openvpn_ethhdr); } |