summaryrefslogtreecommitdiffstats
path: root/tun.c
diff options
context:
space:
mode:
authorGert Doering <gert@greenie.muc.de>2010-02-16 15:40:31 +0100
committerGert Doering <gert@greenie.muc.de>2011-04-24 17:22:36 +0200
commit4341f7c507f0a3e960c03f595dbeee7c3e1e628e (patch)
treeb35b88101de254bb38a60e12e590cfde8fe39907 /tun.c
parent1840c852c2074421e2a2e0d56b47ed6154d4b198 (diff)
downloadopenvpn-4341f7c507f0a3e960c03f595dbeee7c3e1e628e.tar.gz
openvpn-4341f7c507f0a3e960c03f595dbeee7c3e1e628e.tar.xz
openvpn-4341f7c507f0a3e960c03f595dbeee7c3e1e628e.zip
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)
Diffstat (limited to 'tun.c')
-rw-r--r--tun.c12
1 files changed, 6 insertions, 6 deletions
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,18 +440,19 @@ 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.
*/