diff options
| author | Josh Cepek <josh.cepek@usa.net> | 2013-05-02 16:17:37 -0500 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-05-03 17:09:43 +0200 |
| commit | 4b22e86d1b7efb6778f169d10f0987485e70549d (patch) | |
| tree | dc3dc32f58f4b5f12778ece249f757d18fbf8404 /src/openvpn/options.c | |
| parent | eb16a92894b3d93c69b6f56a5b852c5089a5304f (diff) | |
| download | openvpn-4b22e86d1b7efb6778f169d10f0987485e70549d.tar.gz openvpn-4b22e86d1b7efb6778f169d10f0987485e70549d.tar.xz openvpn-4b22e86d1b7efb6778f169d10f0987485e70549d.zip | |
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.
Fixes the crash in trac#288.
Signed-off-by: Josh Cepek <josh.cepek@usa.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <klul5d$8ta$1@ger.gmane.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7578
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit d0ccb982e1714c8dfefd6eacf0c6f899eb71b582)
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index ec39212..606d05b 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1830,6 +1830,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 @@ -2352,6 +2354,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 |