diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-06-18 20:39:05 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-06-22 12:17:33 +0200 |
| commit | 2df1fc83a61e5a67f299eb862a35eea4db7d9fc3 (patch) | |
| tree | b5c9bf1427e0b5224eb4cb37570cbbbf0507bd44 | |
| parent | ea5e091ea0732184c4cef82889b1a5d15f14828d (diff) | |
| download | openvpn-2df1fc83a61e5a67f299eb862a35eea4db7d9fc3.tar.gz openvpn-2df1fc83a61e5a67f299eb862a35eea4db7d9fc3.tar.xz openvpn-2df1fc83a61e5a67f299eb862a35eea4db7d9fc3.zip | |
Completely remove ancient IANA port warning.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: 1340044749-10694-3-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/6742
Signed-off-by: David Sommerseth <davids@redhat.com>
| -rw-r--r-- | src/openvpn/init.c | 6 | ||||
| -rw-r--r-- | src/openvpn/options.c | 3 | ||||
| -rw-r--r-- | src/openvpn/options.h | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 61fd2a6..eacb67d 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2462,12 +2462,6 @@ do_option_warnings (struct context *c) { const struct options *o = &c->options; -#if 1 /* JYFIXME -- port warning */ - if (!o->ce.port_option_used && (o->ce.local_port == OPENVPN_PORT && o->ce.remote_port == OPENVPN_PORT)) - msg (M_WARN, "IMPORTANT: OpenVPN's default port number is now %d, based on an official port number assignment by IANA. OpenVPN 2.0-beta16 and earlier used 5000 as the default port.", - OPENVPN_PORT); -#endif - if (o->ping_send_timeout && !o->ping_rec_timeout) msg (M_WARN, "WARNING: --ping should normally be used with --ping-restart or --ping-exit"); diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 6eac407..1791986 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -4921,7 +4921,6 @@ add_option (struct options *options, msg (msglevel, "Bad port number: %s", p[1]); goto err; } - options->ce.port_option_used = true; options->ce.local_port = options->ce.remote_port = port; } else if (streq (p[0], "lport") && p[1]) @@ -4936,7 +4935,6 @@ add_option (struct options *options, goto err; } options->ce.local_port_defined = true; - options->ce.port_option_used = true; options->ce.local_port = port; } else if (streq (p[0], "rport") && p[1]) @@ -4950,7 +4948,6 @@ add_option (struct options *options, msg (msglevel, "Bad remote port number: %s", p[1]); goto err; } - options->ce.port_option_used = true; options->ce.remote_port = port; } else if (streq (p[0], "bind")) diff --git a/src/openvpn/options.h b/src/openvpn/options.h index ee0c69d..caa31b2 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -90,7 +90,6 @@ struct connection_entry int local_port; bool local_port_defined; int remote_port; - bool port_option_used; const char *local; const char *remote; bool remote_float; |