From 4341f7c507f0a3e960c03f595dbeee7c3e1e628e Mon Sep 17 00:00:00 2001
From: Gert Doering <gert@greenie.muc.de>
Date: Tue, 16 Feb 2010 15:40:31 +0100
Subject: add some TODOs to TODO.IPv6 --version: change printing of IPv6
 payload patch version to [...] style fix "make check" regression in tun.c
 (unnecessary change reverted)

---
 ChangeLog.IPv6 | 11 +++++++++++
 TODO.IPv6      | 13 +++++++++++++
 options.c      |  1 +
 tun.c          | 12 ++++++------
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.IPv6 b/ChangeLog.IPv6
index 4881578..f32df8b 100644
--- a/ChangeLog.IPv6
+++ b/ChangeLog.IPv6
@@ -229,3 +229,14 @@ Thu Jan 14 15:41:50 CET 2010
     to be pointed out clearly.
 
   * release as patch 20100114-1
+
+Tue Feb 16 14:43:28 CET 2010
+
+  * options.c: print "IPv6 payload patch" release date in "--version"
+
+  * tun.c: undo change to init_tun() (moving "bool tun" and call to
+    "is_tun_p2p()" further up) - it wasn't needed and breaks "make check"
+
+  * git stuff: rebase on David Sommerseth's openvpn-testing git tree
+
+  * release as patch 20100216-1
diff --git a/TODO.IPv6 b/TODO.IPv6
index 3ea69a5..9437edb 100644
--- a/TODO.IPv6
+++ b/TODO.IPv6
@@ -69,3 +69,16 @@ tun0: flags=8051<UP,POINTOPOINT,RUNNING,MULTICAST> mtu 1500
      silently ignore DAD?  
         Or accept-and-forward iff (multicast && client2client)?
      handle NS/NA
+
+13.) from Martin List-Petersen:
+
+	One thing, and I guess this requires modifications in
+	network-manager-openvpn: It also works, BUT ignores "push
+	route-ipv6-gateway" and "push route-ipv6 ...." (obviously routes pushed
+	from the server) entirely.
+
+14.) from ##openvpn-discussion:
+
+	new features should be #ifdef'ed
+
+	(check whether this is feasible at all)
diff --git a/options.c b/options.c
index fcc2d9d..1ff7b6b 100644
--- a/options.c
+++ b/options.c
@@ -80,6 +80,7 @@ const char title_string[] =
 #ifdef ENABLE_EUREPHIA
   " [eurephia]"
 #endif
+  " [IPv6 payload 20100216-1]"
   " built on " __DATE__
 ;
 
diff --git a/tun.c b/tun.c
index 37560e2..9dcd9e6 100644
--- a/tun.c
+++ b/tun.c
@@ -433,7 +433,6 @@ init_tun (const char *dev,       /* --dev option */
 {
   struct gc_arena gc = gc_new ();
   struct tuntap *tt;
-  bool tun;
 
   ALLOC_OBJ (tt, struct tuntap);
   clear_tuntap (tt);
@@ -441,17 +440,18 @@ init_tun (const char *dev,       /* --dev option */
   tt->type = dev_type_enum (dev, dev_type);
   tt->topology = topology;
 
-  /*
-   * We only handle TUN/TAP devices here, not --dev null devices.
-   */
-  tun = is_tun_p2p (tt);
-
   if (ifconfig_local_parm && ifconfig_remote_netmask_parm)
     {
+      bool tun = false;
       const char *ifconfig_local = NULL;
       const char *ifconfig_remote_netmask = NULL;
       const char *ifconfig_broadcast = NULL;
 
+      /*
+       * We only handle TUN/TAP devices here, not --dev null devices.
+       */
+      tun = is_tun_p2p (tt);
+
       /*
        * Convert arguments to binary IPv4 addresses.
        */
-- 
cgit