summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-09 13:17:37 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-09 13:17:37 +0200
commit632ea7eb1cd7e4c9fa330d4e80acaa6940a4e1a8 (patch)
treea08df552815a830eb3db4bf4b20c64c95cb698b4
parentf0e9663173a07bd9adf0819a1291ed0ef0ac2adc (diff)
Add the minivpn to repository to avoid copying it around.
The jniclose method works. But there should be a java way to do it ... (closes issue #12)
-rw-r--r--AndroidManifest.xml3
-rwxr-xr-xassets/minivpnbin0 -> 2132 bytes
-rw-r--r--src/de/blinkt/openvpn/OpenVPNThread.java2
-rw-r--r--src/de/blinkt/openvpn/OpenVpnManagementThread.java2
-rw-r--r--src/de/blinkt/openvpn/VpnProfile.java4
5 files changed, 6 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 843da00b..bc3f311c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -27,7 +27,6 @@
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
<application
- android:debuggable="true"
android:icon="@drawable/icon"
android:label="@string/app" >
<activity android:name="com.lamerman.FileDialog" />
@@ -74,4 +73,4 @@
</activity-alias>
</application>
-</manifest> \ No newline at end of file
+</manifest>
diff --git a/assets/minivpn b/assets/minivpn
new file mode 100755
index 00000000..d50a656c
--- /dev/null
+++ b/assets/minivpn
Binary files differ
diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java
index a8cb8430..d4d4cd64 100644
--- a/src/de/blinkt/openvpn/OpenVPNThread.java
+++ b/src/de/blinkt/openvpn/OpenVPNThread.java
@@ -76,6 +76,8 @@ public class OpenVPNThread implements Runnable {
argvlist.add(arg);
ProcessBuilder pb = new ProcessBuilder(argvlist);
+ // Hack O rama
+ pb.environment().put("LD_LIBRARY_PATH", "/data/data/de.blinkt.openvpn/lib");
pb.redirectErrorStream(true);
try {
mProcess = pb.start();
diff --git a/src/de/blinkt/openvpn/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
index fb08898b..18d543f1 100644
--- a/src/de/blinkt/openvpn/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
@@ -103,7 +103,7 @@ public class OpenVpnManagementThread implements Runnable {
Log.d("Openvpn", "Got FD from socket: " + fd + " " + fdint);
- //mOpenVPNService.protect(fdint);
+ mOpenVPNService.protect(fdint);
//ParcelFileDescriptor pfd = ParcelFileDescriptor.fromFd(fdint);
//pfd.close();
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index ca5d99f6..227df5ba 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -345,8 +345,8 @@ public class VpnProfile implements Serializable{
Vector<String> args = new Vector<String>();
// Add fixed paramenters
- //args.add("/data/data/de.blinkt.openvpn/lib/openvpn");
- args.add(cacheDir.getAbsolutePath() +"/" +"openvpn");
+ //args.add(cacheDir.getAbsolutePath() +"/" +"openvpn");
+ args.add(cacheDir.getAbsolutePath() +"/" +"minivpn");
args.add("--config");
args.add(cacheDir.getAbsolutePath() + "/" + OVPNCONFIGFILE);