[tor-commits] [orbot/master] make sure tun2socks is loaded properly

[n8fr8@xxxxxxxxxxxxxx]

commit f21f14bf5b2d2fa3cbe037dd4eccfc76656fd296
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Thu Nov 3 12:18:20 2016 -0400

    make sure tun2socks is loaded properly
---
 .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java   | 2 ++
 .../src/main/java/org/torproject/android/service/vpn/Tun2Socks.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
index 1b4cca0..ea07250 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
@@ -93,6 +93,8 @@ public class OrbotVpnManager implements Handler.Callback {
 		File fileBinHome = mService.getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE);
 		filePdnsd = new File(fileBinHome,TorServiceConstants.PDNSD_ASSET_KEY);
 
+		Tun2Socks.init();
+
 	}
    
     //public int onStartCommand(Intent intent, int flags, int startId) {
diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java
index cff4c1c..ff1ac94 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java
@@ -57,6 +57,8 @@ public class Tun2Socks
     // than one instance due to the use of global state (the lwip
     // module, etc.) in the native code.
 
+    public static void init () {}
+
     public static void Start(
             ParcelFileDescriptor vpnInterfaceFileDescriptor,
             int vpnInterfaceMTU,



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits