summaryrefslogtreecommitdiff
path: root/src/de/blinkt
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-07-25 19:54:43 +0200
committerArne Schwabe <arne@rfc2549.org>2012-07-25 19:54:43 +0200
commit02c364271bc75cae5c00faf3b01d2f4b85113d07 (patch)
tree2f54da1e3367a193228659a32612bd3daa4976e2 /src/de/blinkt
parent5e48e30e53bb7b42154866214217bf3f500ee7fd (diff)
parent2b811c50e5b5202eedab9d0a9768ec5e0d7168a3 (diff)
Merge
Diffstat (limited to 'src/de/blinkt')
-rw-r--r--src/de/blinkt/openvpn/ConfigParser.java2
-rw-r--r--src/de/blinkt/openvpn/LaunchVPN.java4
-rw-r--r--src/de/blinkt/openvpn/OpenVPNThread.java2
-rw-r--r--src/de/blinkt/openvpn/VpnProfile.java9
4 files changed, 11 insertions, 6 deletions
diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java
index f9eac745..c8fb3870 100644
--- a/src/de/blinkt/openvpn/ConfigParser.java
+++ b/src/de/blinkt/openvpn/ConfigParser.java
@@ -472,7 +472,7 @@ public class ConfigParser {
for(Vector<Vector<String>> option:options.values()) {
for(Vector<String> optionsline: option) {
for (String arg : optionsline)
- custom+= arg + " ";
+ custom+= VpnProfile.openVpnEscape(arg) + " ";
}
custom+="\n";
diff --git a/src/de/blinkt/openvpn/LaunchVPN.java b/src/de/blinkt/openvpn/LaunchVPN.java
index 04294c33..bfc6256e 100644
--- a/src/de/blinkt/openvpn/LaunchVPN.java
+++ b/src/de/blinkt/openvpn/LaunchVPN.java
@@ -90,7 +90,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener {
mPM =ProfileManager.getInstance(this);
- }
+ }
@Override
protected void onStart() {
@@ -224,7 +224,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener {
}
private boolean writeMiniVPN() {
- File mvpnout = new File(getCacheDir(),"miniovpn");
+ File mvpnout = new File(getCacheDir(),VpnProfile.MINIVPN);
if (mvpnout.exists() && mvpnout.canExecute())
return true;
diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java
index 4477fa5f..97e07c9d 100644
--- a/src/de/blinkt/openvpn/OpenVPNThread.java
+++ b/src/de/blinkt/openvpn/OpenVPNThread.java
@@ -58,7 +58,7 @@ public class OpenVPNThread implements Runnable {
// Hack O rama
// Hack until I find a good way to get the real library path
- String applibpath = argv[0].replace("/cache/miniovpn", "/lib");
+ String applibpath = argv[0].replace("/cache/" + VpnProfile.MINIVPN , "/lib");
String lbpath = pb.environment().get("LD_LIBRARY_PATH");
if(lbpath==null)
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index 91c4c494..4e381fcc 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -97,6 +97,7 @@ public class VpnProfile implements Serializable{
public boolean mUseDefaultRoutev6=true;
public String mCustomRoutesv6="";
public String mKeyPassword="";
+ static final String MINIVPN = "miniopenvpn";
@@ -116,7 +117,11 @@ public class VpnProfile implements Serializable{
String escapedString = unescaped.replace("\\", "\\\\");
escapedString = escapedString.replace("\"","\\\"");
escapedString = escapedString.replace("\n","\\n");
- return '"' + escapedString + '"';
+
+ if (escapedString.equals(unescaped) && !escapedString.contains(" "))
+ return unescaped;
+ else
+ return '"' + escapedString + '"';
}
@@ -428,7 +433,7 @@ public class VpnProfile implements Serializable{
// Add fixed paramenters
//args.add("/data/data/de.blinkt.openvpn/lib/openvpn");
- args.add(cacheDir.getAbsolutePath() +"/" +"miniovpn");
+ args.add(cacheDir.getAbsolutePath() +"/" + VpnProfile.MINIVPN);
args.add("--config");
args.add(cacheDir.getAbsolutePath() + "/" + OVPNCONFIGFILE);