diff options
author | JuanJo Ciarlante <jjo+ml@google.com> | 2011-05-26 19:01:42 +0200 |
---|---|---|
committer | David Sommerseth <davids@redhat.com> | 2011-08-25 20:19:58 +0200 |
commit | eb23089183745853fac9414d45a559a478ef51d6 (patch) | |
tree | 9830a2b6240d98ab62ea4bf901f30825ebf6acf9 /mroute.c | |
parent | 1ffdb2c9662c3af1f992183435b1afb006dfdc6c (diff) | |
download | openvpn-eb23089183745853fac9414d45a559a478ef51d6.tar.gz openvpn-eb23089183745853fac9414d45a559a478ef51d6.tar.xz openvpn-eb23089183745853fac9414d45a559a478ef51d6.zip |
USE_PF_INET6 by default for v2.3
- put all #ifdef'd code in place, kill the cpp symbol,
- thus in v2.3 it's not actually possible to --disable-ipv6 :)
RATIONALE:
#1 some wacky compilers choke on #ifdef'd constructions for
concatenated strings, and given that:
#2 v2.3 has already transport ipv6 by default
=> doesn't justify putting effort on #1 to keep USE_PF_INET6
ifdef wraps.
Signed-off-by: JuanJo Ciarlante <jjo+ml@google.com>
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'mroute.c')
-rw-r--r-- | mroute.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -287,7 +287,6 @@ bool mroute_extract_openvpn_sockaddr (struct mroute_addr *addr, } return true; } -#ifdef USE_PF_INET6 case AF_INET6: if (use_port) { @@ -305,7 +304,6 @@ bool mroute_extract_openvpn_sockaddr (struct mroute_addr *addr, memcpy (addr->addr, &osaddr->addr.in6.sin6_addr, 16); } return true; -#endif } return false; } |