Compare commits

...
2 Commits
Author SHA1 Message Date
Max Lv 34af6aeef5 refine the IPC to tun2socks 2015-07-28 14:48:21 +08:00
Max Lv d9af2f93e0 fix plugin 2015-07-27 11:09:52 +08:00
3 changed files with 15 additions and 14 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns) 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 += Resolver.sbtPluginRepo("snapshots") resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
addSbtPlugin("com.hanhuy.sbt" % "sbt-idea" % "1.7.0-SNAPSHOT") addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.7.0-SNAPSHOT")
+2 -2
View File
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.shadowsocks" package="com.github.shadowsocks"
android:versionCode="110" android:versionCode="111"
android:versionName="2.7.2"> android:versionName="2.7.3">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -266,17 +266,18 @@ class ShadowsocksVpnService extends VpnService with BaseService {
} }
val fd = startVpn() val fd = startVpn()
if (fd == -1) {
false if (fd != -1) {
} else { var tries = 1
Thread.sleep(1000) while (tries < 5) {
if (System.sendfd(fd) == -1) { Thread.sleep(1000 * tries)
false if (System.sendfd(fd) != -1) {
} else { return true
true }
tries += 1
} }
} }
false
} }
def startShadowsocksDaemon() { def startShadowsocksDaemon() {