diff options
author | Parménides GV <parmegv@sdf.org> | 2014-06-16 14:13:57 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-06-16 14:13:57 +0200 |
commit | 482c378c2ff3a37a76ed5788cf4eaef30a63d517 (patch) | |
tree | 868b4bca345e9710a2a3d665b475959b63c607c5 /ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java | |
parent | 69b10487fcd63dfe1e94fa97c9f3fd9b035646b4 (diff) | |
parent | e2793ff1ad97a373993fd8628a514c772d6d5434 (diff) |
Merge branch 'develop'
Diffstat (limited to 'ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java')
-rw-r--r-- | ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java index 67c24884..0de54ed7 100644 --- a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java +++ b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java @@ -1,18 +1,28 @@ package de.blinkt.openvpn.core; import android.util.Log; -import se.leap.bitmaskclient.R; -import de.blinkt.openvpn.VpnProfile; -import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus; -import de.blinkt.openvpn.core.VpnStatus.LogItem; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedList; +import java.util.Locale; +import java.util.Map; import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; +import se.leap.bitmaskclient.R; +import de.blinkt.openvpn.VpnProfile; +import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus; +import de.blinkt.openvpn.core.VpnStatus.LogItem; + public class OpenVPNThread implements Runnable { private static final String DUMP_PATH_STRING = "Dump path: "; private static final String TAG = "OpenVPN"; @@ -158,16 +168,16 @@ public class OpenVPNThread implements Runnable { private String genLibraryPath(String[] argv, ProcessBuilder pb) { // Hack until I find a good way to get the real library path - String applibpath = argv[0].replace("/cache/" + VpnProfile.MINIVPN , "/lib"); + String applibpath = argv[0].replace("/cache/" + VpnProfile.getMiniVPNExecutableName() , "/lib"); String lbpath = pb.environment().get("LD_LIBRARY_PATH"); if(lbpath==null) lbpath = applibpath; else - lbpath = lbpath + ":" + applibpath; + lbpath = applibpath + ":" + lbpath; if (!applibpath.equals(mNativeDir)) { - lbpath = lbpath + ":" + mNativeDir; + lbpath = mNativeDir + ":" + lbpath; } return lbpath; } |