From: Gert Doering Date: Tue, 16 Feb 2010 14:40:31 +0000 (+0100) Subject: add some TODOs to TODO.IPv6 X-Git-Tag: v2.3-alpha1~239^2~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64d2297d398cbf131da5908858abcbb2dac8a033;p=thirdparty%2Fopenvpn.git 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) --- diff --git a/tun.c b/tun.c index 37560e2fa..9dcd9e6fb 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. */