summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-02 13:48:38 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-02 13:48:38 +0200
commitb84e3939a015b42c316af0b63297932e6fcf8ba4 (patch)
treed20b3b0553e88bc34789827da9b63150283aff90
parent23c305fb6b9d4b0fdfd453c42726c72c523d60cb (diff)
clarify warning, reset domain on opening tun
-rw-r--r--AndroidManifest.xml4
-rw-r--r--openvpn/src/openvpn/options.c9
-rw-r--r--src/de/blinkt/openvpn/OpenVpnService.java1
3 files changed, 8 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 24eee10d..7adbf359 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="29"
- android:versionName="0.5.7" >
+ android:versionCode="30"
+ android:versionName="0.5.8" >
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/openvpn/src/openvpn/options.c b/openvpn/src/openvpn/options.c
index dae36103..dcb6340e 100644
--- a/openvpn/src/openvpn/options.c
+++ b/openvpn/src/openvpn/options.c
@@ -228,7 +228,7 @@ static const char usage_message[] =
"--route-noexec : Don't add routes automatically. Instead pass routes to\n"
" --route-up script using environmental variables.\n"
"--route-nopull : When used with --client or --pull, accept options pushed\n"
- " by server EXCEPT for routes.\n"
+ " by server EXCEPT for routes and dhcp options.\n"
"--allow-pull-fqdn : Allow client to pull DNS names from server for\n"
" --ifconfig, --route, and --route-gateway.\n"
"--redirect-gateway [flags]: Automatically execute routing\n"
@@ -4029,18 +4029,19 @@ void options_string_import (struct options *options,
#if P2MP
-#define VERIFY_PERMISSION(mask) { if (!verify_permission(p[0], (mask), permission_mask, option_types_found, msglevel)) goto err; }
+#define VERIFY_PERMISSION(mask) { if (!verify_permission(p[0], file, (mask), permission_mask, option_types_found, msglevel)) goto err; }
static bool
verify_permission (const char *name,
- const unsigned int type,
+ const char* file,
+ const unsigned int type,
const unsigned int allowed,
unsigned int *found,
const int msglevel)
{
if (!(type & allowed))
{
- msg (msglevel, "option '%s' cannot be used in this context", name);
+ msg (msglevel, "option '%s' cannot be used in this context (%s)", name, file);
return false;
}
else
diff --git a/src/de/blinkt/openvpn/OpenVpnService.java b/src/de/blinkt/openvpn/OpenVpnService.java
index 8aa39d89..2b44fe03 100644
--- a/src/de/blinkt/openvpn/OpenVpnService.java
+++ b/src/de/blinkt/openvpn/OpenVpnService.java
@@ -256,6 +256,7 @@ public class OpenVpnService extends VpnService {
mRoutesv6.clear();
mLocalIP=null;
mLocalIPv6=null;
+ mDomain=null;
builder.setConfigureIntent(getLogPendingIntent());