diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-24 18:28:03 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-24 18:28:03 +0200 |
| commit | 7e02edb743934f4040fd1aac1cba4a121b66a228 (patch) | |
| tree | 58e065bf5daba1d8ca1d99b69ae4dad6afa6c700 | |
| parent | 6d113da4ac3b8689bc803109cff04425da26c78b (diff) | |
Better way of fixing port warning
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | openvpn/src/openvpn/init.c | 4 | ||||
| -rw-r--r-- | openvpn/src/openvpn/options.c | 1 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/ConfigParser.java | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c6f8a75..24eee10 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.blinkt.openvpn" - android:versionCode="28" - android:versionName="0.5.6" > + android:versionCode="29" + android:versionName="0.5.7" > <uses-permission android:name="android.permission.INTERNET" /> diff --git a/openvpn/src/openvpn/init.c b/openvpn/src/openvpn/init.c index 93ea2f9..810a0c6 100644 --- a/openvpn/src/openvpn/init.c +++ b/openvpn/src/openvpn/init.c @@ -2292,10 +2292,10 @@ do_init_crypto_tls (struct context *c, const unsigned int flags) to.mda_context = &c->c2.mda_context; #endif + to.tmp_dir = options->tmp_dir; #if P2MP_SERVER to.auth_user_pass_verify_script = options->auth_user_pass_verify_script; to.auth_user_pass_verify_script_via_file = options->auth_user_pass_verify_script_via_file; - to.tmp_dir = options->tmp_dir; if (options->ccd_exclusive) to.client_config_dir_exclusive = options->client_config_dir; #endif @@ -2477,7 +2477,7 @@ do_option_warnings (struct context *c) { const struct options *o = &c->options; -#if 0 /* JYFIXME -- port warning */ +#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); diff --git a/openvpn/src/openvpn/options.c b/openvpn/src/openvpn/options.c index a2d0f6e..dae3610 100644 --- a/openvpn/src/openvpn/options.c +++ b/openvpn/src/openvpn/options.c @@ -4518,6 +4518,7 @@ add_option (struct options *options, goto err; } re.remote_port = port; + options->ce.port_option_used = true; if (p[3]) { const int proto = ascii2proto (p[3]); diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java index 8510710..ea7d60e 100644 --- a/src/de/blinkt/openvpn/ConfigParser.java +++ b/src/de/blinkt/openvpn/ConfigParser.java @@ -219,6 +219,7 @@ public class ConfigParser { "route-gateway", "topology", "persist-tun", + "persist-key", "route-metric", "suppress-timestamps", "management-query-passwords", |