summaryrefslogtreecommitdiffstats
path: root/multi.c
diff options
context:
space:
mode:
authorJuanJo Ciarlante <jjo+ml@google.com>2011-05-26 19:01:42 +0200
committerDavid Sommerseth <davids@redhat.com>2011-08-25 20:19:58 +0200
commiteb23089183745853fac9414d45a559a478ef51d6 (patch)
tree9830a2b6240d98ab62ea4bf901f30825ebf6acf9 /multi.c
parent1ffdb2c9662c3af1f992183435b1afb006dfdc6c (diff)
downloadopenvpn-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 'multi.c')
-rw-r--r--multi.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/multi.c b/multi.c
index 3a2fe9a..1a2f86a 100644
--- a/multi.c
+++ b/multi.c
@@ -2789,24 +2789,10 @@ tunnel_server (struct context *top)
{
ASSERT (top->options.mode == MODE_SERVER);
-#ifdef USE_PF_INET6
if (proto_is_dgram(top->options.ce.proto))
tunnel_server_udp(top);
else
tunnel_server_tcp(top);
-#else
- switch (top->options.ce.proto)
- {
- case PROTO_UDPv4:
- tunnel_server_udp (top);
- break;
- case PROTO_TCPv4_SERVER:
- tunnel_server_tcp (top);
- break;
- default:
- ASSERT (0);
- }
-#endif
}
#else