fully support UDP

(code from Outline)
UWNetworksLab · Oct 14, 2019 · d0f9d64 · d0f9d64
1 parent 89eb73c
commit d0f9d64
Show file tree

Hide file tree

Showing 26 changed files with 2,744 additions and 1,848 deletions.
diff --git a/android/java/org/uproxy/tun2socks/Tun2SocksJni.java b/android/java/org/uproxy/tun2socks/Tun2SocksJni.java
@@ -28,10 +28,12 @@ public static native int runTun2Socks(
       int vpnInterfaceMTU,
       String vpnIpAddress,
       String vpnNetMask,
+      String vpnIpV6Address,
       String socksServerAddress,
       String udpRelayAddress,
       String dnsResolverAddress,
-      int transparentDNS);
+      int transparentDNS,
+      int socks5UDP);
 
   public static native int terminateTun2Socks();
 

diff --git a/android/java/org/uproxy/tun2socks/Tunnel.java b/android/java/org/uproxy/tun2socks/Tunnel.java
@@ -125,6 +125,7 @@ public synchronized void stop() {
   //----------------------------------------------------------------------------
 
   private static final String VPN_INTERFACE_NETMASK = "255.255.255.0";
+  private static final String VPN_IPV6_NULL = null;  // No IPv6 support.
   private static final int VPN_INTERFACE_MTU = 1500;
   private static final String DNS_RESOLVER_IP = "8.8.8.8";
   private static final int DNS_RESOLVER_PORT = 53;
@@ -199,10 +200,12 @@ private boolean routeThroughTunnel(String socksServerAddress) {
         VPN_INTERFACE_MTU,
         mPrivateAddress.mRouter,
         VPN_INTERFACE_NETMASK,
+        VPN_IPV6_NULL,
         socksServerAddress,
         socksServerAddress,  // The UDP relay has the same address and port as the SOCKS server.
         String.format("%s:%d", DNS_RESOLVER_IP, DNS_RESOLVER_PORT),
-        true /* transparent DNS */);
+        true /* transparent DNS */,
+        true /* socks5 UDP Enabled */);
 
     mHostService.onTunnelConnected();
     mHostService.onDiagnosticMessage("routing through tunnel");
@@ -245,10 +248,12 @@ private void startTun2Socks(
       final int vpnInterfaceMTU,
       final String vpnIpAddress,
       final String vpnNetMask,
+      final String vpnIpV6Address,
       final String socksServerAddress,
       final String udpRelayAddress,
       final String dnsResolverAddress,
-      final boolean transparentDns) {
+      final boolean transparentDns,
+      final boolean socks5UdpEnabled) {
     if (mTun2SocksThread != null) {
       return;
     }
@@ -262,10 +267,12 @@ public void run() {
                     vpnInterfaceMTU,
                     vpnIpAddress,
                     vpnNetMask,
+                    vpnIpV6Address,
                     socksServerAddress,
                     udpRelayAddress,
                     dnsResolverAddress,
-                    transparentDns ? 1 : 0);
+                    transparentDns ? 1 : 0,
+                    socks5UdpEnabled ? 1 : 0);
               }
             });
     mTun2SocksThread.start();

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
@@ -10,6 +10,13 @@ LOCAL_CFLAGS += -DBADVPN_USE_SELFPIPE -DBADVPN_USE_EPOLL
 LOCAL_CFLAGS += -DBADVPN_LITTLE_ENDIAN
 LOCAL_CFLAGS += -DPSIPHON
 
+ifeq ($(NDK_DEBUG),1)
+    LOCAL_CFLAGS += -g -O0 -fno-omit-frame-pointer
+    LOCAL_SANITIZE := address
+    LOCAL_MODULE_RELATIVE_PATH := asan
+    cmd-strip :=
+endif
+
 LOCAL_C_INCLUDES:= \
         $(LOCAL_PATH) \
         $(LOCAL_PATH)/lwip/src/include/ipv4 \
@@ -19,6 +26,7 @@ LOCAL_C_INCLUDES:= \
 
 LOCAL_SRC_FILES := \
         base/BLog_syslog.c \
+        system/BDatagram_unix.c \
         system/BReactor_badvpn.c \
         system/BSignal.c \
         system/BConnection_unix.c \
@@ -70,6 +78,7 @@ LOCAL_SRC_FILES := \
         flowextra/PacketPassInactivityMonitor.c \
         tun2socks/SocksUdpGwClient.c \
         udpgw_client/UdpGwClient.c \
+        socks_udp_client/SocksUdpClient.c \
         stringmap/BStringMap.c
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt
@@ -312,8 +312,10 @@ if (BUILD_NCD AND NOT EMSCRIPTEN)
 endif ()
 if (BUILD_TUN2SOCKS)
     add_subdirectory(socksclient)
+    add_subdirectory(socks_udp_client)
     add_subdirectory(udpgw_client)
     add_subdirectory(lwip)
+    add_subdirectory(stringmap)
 endif ()
 if (BUILD_TUNCTL)
     add_subdirectory(tunctl)

diff --git a/android/jni/COPYING → android/jni/LICENSE b/android/jni/COPYING → android/jni/LICENSE
diff --git a/android/jni/blog_channels.txt b/android/jni/blog_channels.txt
@@ -89,6 +89,7 @@ NCDRfkillMonitor 4
 udpgw 4
 UdpGwClient 4
 SocksUdpGwClient 4
+SocksUdpClient 4
 BNetwork 4
 BConnection 4
 BSSLConnection 4

diff --git a/android/jni/generated/blog_channel_SocksUdpClient.h b/android/jni/generated/blog_channel_SocksUdpClient.h
@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_SocksUdpClient
diff --git a/android/jni/generated/blog_channels_defines.h b/android/jni/generated/blog_channels_defines.h
@@ -143,4 +143,5 @@
 #define BLOG_CHANNEL_BThreadSignal 142
 #define BLOG_CHANNEL_BLockReactor 143
 #define BLOG_CHANNEL_ncd_load_module 144
-#define BLOG_NUM_CHANNELS 145
+#define BLOG_CHANNEL_SocksUdpClient 145
+#define BLOG_NUM_CHANNELS 146
diff --git a/android/jni/generated/blog_channels_list.h b/android/jni/generated/blog_channels_list.h
@@ -143,3 +143,4 @@
 {"BThreadSignal", 4},
 {"BLockReactor", 4},
 {"ncd_load_module", 4},
+{"SocksUdpClient", 4},