Fix UDP forward

shadowsocks · Aug 7, 2016 · 4817539 · 4817539
1 parent 03c8575
commit 4817539
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/kcptun/go b/kcptun/go
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="143"
-          android:versionName="3.0.1">
+          android:versionCode="144"
+          android:versionName="3.0.2">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -182,25 +182,25 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   /** Called when the activity is first created. */
   def handleConnection: Boolean = {
 
-    if (!profile.udpdns) {
-      startDnsDaemon()
-      startDnsTunnel()
+    val fd = startVpn()
+    if (!sendFd(fd)) return false
+
+    if (profile.kcp) {
+      startKcptunDaemon()
     }
 
     startShadowsocksDaemon()
 
-    if (profile.udpdns) {
+    if (profile.udpdns && profile.kcp) {
       startShadowsocksUDPDaemon()
     }
 
-    val fd = startVpn()
-    val ret = sendFd(fd)
-
-    if (ret && profile.kcp) {
-      startKcptunDaemon()
+    if (!profile.udpdns) {
+      startDnsDaemon()
+      startDnsTunnel()
     }
 
-    ret
+    true
   }
 
   def startKcptunDaemon() {
@@ -274,6 +274,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
     if (profile.auth) cmd += "-A"
 
+    if (profile.udpdns && !profile.kcp) cmd += "-u"
+
     if (profile.route != Route.ALL) {
       cmd += "--acl"
       cmd += (getApplicationInfo.dataDir + "/acl.list")