Skip to contentSkip to conversation

Fix proto tcp6 for server & non-P2MP modes

PATCH In review Josh Cepek 2 participants 3 messages May 2, 2013 – May 3, 2013

lore
Share & tools
lore

Josh Cepek

author
#0 lore raw

PATCH 1/1 Fix proto tcp6 for server & non-P2MP modes

This fix adds support for using tcp6 as a proto in server or non-P2MP modes, resolving a failed ASSERT in such cases.

---
 src/openvpn/options.c | 4 ++++
 1 file changed, 4 insertions(+)
src/openvpn/options.c +4 -0
index 05c6da2..c86f795 100644
@@ -1833,6 +1833,8 @@ options_postprocess_verify_ce (const struct options *options, const struct conne
    */
   if (ce->proto == PROTO_TCPv4)
     msg (M_USAGE, "--proto tcp is ambiguous in this context.  Please specify --proto tcp-server or --proto tcp-client");
+  if (ce->proto == PROTO_TCPv6)
+    msg (M_USAGE, "--proto tcp6 is ambiguous in this context.  Please specify --proto tcp6-server or --proto tcp6-client");
 
   /*
    * Sanity check on daemon/inetd modes
@@ -2355,6 +2357,8 @@ options_postprocess_mutate_ce (struct options *o, struct connection_entry *ce)
     {
       if (ce->proto == PROTO_TCPv4)
        ce->proto = PROTO_TCPv4_SERVER;
+      else if (ce->proto == PROTO_TCPv6)
+       ce->proto = PROTO_TCPv6_SERVER;
     }
 #endif
 #if P2MP

--
1.8.1.5

#1 lore raw

Hi,

Quoted 2 lines · Josh Cepek

This fix adds support for using tcp6 as a proto in server or non-P2MP modes, resolving a failed ASSERT in such cases.

ACK, thanks for the patch. Will apply to master and 2.3 branch ASAP (with the understanding that the master/2.4 branch will eventually get Arne's dual-stack patches, which make this whole mess moot).

gert

Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...
#2 lore raw
In reply to Josh Cepek

Your patch has been applied to the master and release/2.3 branch.

commit d0ccb982e1714c8dfefd6eacf0c6f899eb71b582 (master) commit 4b22e86d1b7efb6778f169d10f0987485e70549d (release/2.3)

Author: Josh Cepek
Date:   Thu May 2 16:17:37 2013 -0500
     Fix proto tcp6 for server & non-P2MP modes

     Signed-off-by: Josh Cepek <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/7578
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering