refine the IPC to tun2socks

xssxsxk · Jul 28, 2015 · 34af6ae · 34af6ae
1 parent d9af2f9
commit 34af6ae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.4.6")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.4.7")
 
 resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 

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"
     package="com.github.shadowsocks"
-    android:versionCode="110"
-    android:versionName="2.7.2">
+    android:versionCode="111"
+    android:versionName="2.7.3">
 
   <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
@@ -266,17 +266,18 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     }
 
     val fd = startVpn()
-    if (fd == -1) {
-      false
-    } else {
-      Thread.sleep(1000)
-      if (System.sendfd(fd) == -1) {
-        false
-      } else {
-        true
+
+    if (fd != -1) {
+      var tries = 1
+      while (tries < 5) {
+        Thread.sleep(1000 * tries)
+        if (System.sendfd(fd) != -1) {
+          return true
+        }
+        tries += 1
       }
     }
-
+    false
   }
 
   def startShadowsocksDaemon() {