Merge pull request #1352 from guardianproject/hevsocks

Replace go-tun2socks with hev-socks5-tunnel C library

Author: tladesignz

.gitignore

@@ -31,10 +31,6 @@ obj/
 
 # Orbot libs
 libs/jtorctl.jar
-app/src/main/jniLibs/
-app/src/main/libs/
-orbotservice/src/main/libs/
-OrbotLib/OrbotIPtProxy
 
 # Fastlane
 /fastlane/report.xml

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/src/main/jni/hev-socks5-tunnel"]
+	path = app/src/main/jni/hev-socks5-tunnel
+	url = https://github.com/heiher/hev-socks5-tunnel.git

OrbotLib/.gitignore

@@ -44,4 +44,24 @@ learn to configure it properly. Learn more: <https://torproject.org/>
 </div>
 
 ***********************************************
+
+
+### Build Instructions
+
+Orbot is built with [hev-socks5-tunnel](https://github.com/heiher/hev-socks5-tunnel). Before you can build Orbot, you'll need to clone the submodule
+for this dependency. Once cloned, Android Studio + Gradle will take care of building the C code.
+
+```sh
+git clone --recursive https://github.com/guardianproject/orbot-android
+```
+
+Or, if you already cloned the repo:
+
+```sh
+cd orbot-android
+git pull
+git submodule update --init --recursive
+```
+
+
 **Copyright &#169; 2009-2025, Nathan Freitas, The Guardian Project**

OrbotLib/OrbotLib-sources.jar

@@ -83,6 +83,13 @@ android {
         }
     }
 
+    ndkVersion = "28.2.13676358"
+    externalNativeBuild {
+        ndkBuild {
+            path = file("src/main/jni/Android.mk")
+        }
+    }
+
     productFlavors {
         create("fullperm") { 
 	    dimension = "free"
@@ -129,7 +136,6 @@ android.applicationVariants.all {
 }
 
 dependencies {
-    implementation(project(":OrbotLib"))
     implementation(libs.android.material)
     implementation(libs.android.volley)
     implementation(libs.androidx.activity)
@@ -150,8 +156,7 @@ dependencies {
     implementation(libs.appiconnamechanger)
     implementation(libs.androidx.work.kotlin)
     implementation(libs.upnp)
-    implementation(libs.pcap.core)
-    implementation(libs.pcap.factory)
+    implementation(libs.iptproxy)
     implementation(files("../libs/geoip.jar"))
     api(libs.guardian.jtorctl)
     api(libs.tor.android)

OrbotLib/OrbotLib.aar

@@ -0,0 +1,18 @@
+package org.torproject.android.service;
+
+public class TProxyService {
+    public static native void TProxyStartService(String config_path, int fd);
+    public static native void TProxyStopService();
+    public static native long[] TProxyGetStats();
+
+    static {
+        System.loadLibrary("hev-socks5-tunnel");
+    }
+
+    public static final String VIRTUAL_GATEWAY_IPV4 = "198.18.0.1";
+    public static final String VIRTUAL_GATEWAY_IPV6 = "fc00::1";
+    public final static String FAKE_DNS = "198.18.0.2";
+
+    public static final int TASK_SIZE = 81920;
+    public static final int TUNNEL_MTU = 8500;
+}