Hi, as discussed just now on IRC, I have adapted the IPv6 check in tun.c to the version number used by the 2.2-beta3 tap driver.
David: could you please pull from
git://compile.svr01.mucip.net/openvpn-gert.git "master"
to feat_ipv6_payload?
gert
--
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
From 54a6339bc4875ae5daadbbc561211592ce872044 Mon Sep 17 00:00:00 2001
From: Gert Doering <g...@greenie.muc.de>
List-Post: openvpn-devel@lists.sourceforge.net
Date: Thu, 2 Sep 2010 21:20:30 +0200
Subject: [PATCH] 2.2-beta3 has a signed TAP driver with the IPv6 code, but it's
not
version 9.7 as anticipated (that's 2.1.3) but 9.8 - change test to
require 9.8, and change message to point to 2.2-beta3 and up.
Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
ChangeLog.IPv6 | 5 +++++
tun.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog.IPv6 b/ChangeLog.IPv6
index 4275389..19bbad7 100644
--- a/ChangeLog.IPv6
+++ b/ChangeLog.IPv6
@@ -333,3 +333,8 @@ Sun Aug 8 12:30:44 CEST 2010
* tun.c: destroy tunX interface at tun_close() on OpenBSD (cleanup)
* TEST SUCCESS: OpenBSD 4.7: client-tun/net30, v4+v6
+
+Thu Sep 2 21:18:32 CEST 2010
+
+ * tun.c: the TAP binary in 2.2-beta3 has the IPv6 related changes, but
+ the version number is 9.8 now -> check for 9.8, not 9.7
diff --git a/tun.c b/tun.c
index 3e4b37f..30d3be1 100644
--- a/tun.c
+++ b/tun.c
@@ -4319,9 +4319,9 @@ open_tun (const char *dev, const char *dev_type, const
char *dev_node, struct tu
* *this* version of the driver
*/
if ( tt->ipv6 && tt->type == DEV_TYPE_TUN &&
- info[0] == 9 && info[1] < 7)
+ info[0] == 9 && info[1] < 8)
{
- msg( M_INFO, "WARNING: Tap-Win32 driver version %d.%d does not support
IPv6 in TUN mode. IPv6 will be disabled. Upgrade to Tap-Win32 9.7 or use TAP
mode to get IPv6", (int) info[0], (int) info[1] );
+ msg( M_INFO, "WARNING: Tap-Win32 driver version %d.%d does not support
IPv6 in TUN mode. IPv6 will be disabled. Upgrade to Tap-Win32 9.8 (2.2-beta3
release or later) or use TAP mode to get IPv6", (int) info[0], (int) info[1] );
tt->ipv6 = false;
}
}
--
1.7.0.5
pgpoWww6mNB7t.pgp
Description: PGP signature
