From dd6cd3977d1e43b2bf28d3aa2cb841073c06c370 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sat, 13 Aug 2016 17:33:10 +0800 Subject: [PATCH] Fix #806 #804 --- kcptun/go | 2 +- kcptun/make.bash | 4 ++-- src/main/jni/shadowsocks-libev | 2 +- .../scala/com/github/shadowsocks/ShadowsocksNatService.scala | 2 +- .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kcptun/go b/kcptun/go index 31cf00a8..70f0438d 160000 --- a/kcptun/go +++ b/kcptun/go @@ -1 +1 @@ -Subproject commit 31cf00a881a9535d2e1282caf92542b9c31b0e7d +Subproject commit 70f0438db89066e5ed9fdd78f6e99d40f4a76ab3 diff --git a/kcptun/make.bash b/kcptun/make.bash index c89197af..3990d12a 100755 --- a/kcptun/make.bash +++ b/kcptun/make.bash @@ -55,12 +55,12 @@ go get -u github.com/xtaci/kcp-go go get echo "Cross compile kcptun for arm" -try env CGO_ENABLED=1 CC=$ANDROID_ARM_CC GOOS=android GOARCH=arm GOARM=7 go build +try env CGO_ENABLED=1 CC=$ANDROID_ARM_CC GOOS=android GOARCH=arm GOARM=7 go build -ldflags="-s -w" try $ANDROID_ARM_STRIP client try mv client $DIR/../src/main/assets/armeabi-v7a/kcptun echo "Cross compile kcptun for x86" -try env CGO_ENABLED=1 CC=$ANDROID_X86_CC GOOS=android GOARCH=386 go build +try env CGO_ENABLED=1 CC=$ANDROID_X86_CC GOOS=android GOARCH=386 go build -ldflags="-s -w" try $ANDROID_X86_STRIP client try mv client $DIR/../src/main/assets/x86/kcptun popd diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev index 8f72416f..d31210c2 160000 --- a/src/main/jni/shadowsocks-libev +++ b/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit 8f72416f0f487adab36598678576ab288bfc4f84 +Subproject commit d31210c21731ba9b055faccdc26c77b10773fe67 diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index 46c8e06a..5dd68353 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -122,7 +122,7 @@ class ShadowsocksNatService extends BaseService { cmd += (getApplicationInfo.dataDir + "/kcptun" , "-r", profile.host + ":" + profile.kcpPort , "-l", "127.0.0.1:" + (profile.localPort + 90) - , profile.kcpcli.trim) + , profile.kcpcli.trim.replaceAll("[\"']", "")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index d58c5c66..f74bba1f 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -211,7 +211,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { , "-r", profile.host + ":" + profile.kcpPort , "-l", "127.0.0.1:" + (profile.localPort + 90) , "--path", getApplicationInfo.dataDir + "/protect_path" - , profile.kcpcli.trim) + , profile.kcpcli.trim.replaceAll("[\"']", "")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))