summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGert Doering <gert@greenie.muc.de>2010-09-02 21:20:30 +0200
committerGert Doering <gert@greenie.muc.de>2011-04-24 17:22:44 +0200
commit48173b72c63796aabe5bfb76de05087fe543aa19 (patch)
treeb983c025a25074ee9f192854242e158ac4c7df86
parent670d1b57b63df92f29b5c5fc882da6941ff2b0b2 (diff)
downloadopenvpn-48173b72c63796aabe5bfb76de05087fe543aa19.tar.gz
openvpn-48173b72c63796aabe5bfb76de05087fe543aa19.tar.xz
openvpn-48173b72c63796aabe5bfb76de05087fe543aa19.zip
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 <gert@greenie.muc.de>
-rw-r--r--ChangeLog.IPv65
-rw-r--r--tun.c4
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 5f636e2..9c464bc 100644
--- a/tun.c
+++ b/tun.c
@@ -4481,9 +4481,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;
}
}