From eb23089183745853fac9414d45a559a478ef51d6 Mon Sep 17 00:00:00 2001 From: JuanJo Ciarlante Date: Thu, 26 May 2011 19:01:42 +0200 Subject: USE_PF_INET6 by default for v2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 Signed-off-by: Samuli Seppänen Acked-by: David Sommerseth Signed-off-by: David Sommerseth --- multi.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'multi.c') 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 -- cgit