From 667619f7013b64d96be7415e4467d75c6e72862f Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 17 Dec 2014 08:42:43 +0800 Subject: [PATCH] tune timeout for long tcp connection --- src/main/jni/shadowsocks | 2 +- .../shadowsocks/ShadowsocksNatService.scala | 3 +++ .../shadowsocks/ShadowsocksVpnService.scala | 18 ++++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/jni/shadowsocks b/src/main/jni/shadowsocks index 561c28b5..cd6a5e40 160000 --- a/src/main/jni/shadowsocks +++ b/src/main/jni/shadowsocks @@ -1 +1 @@ -Subproject commit 561c28b5730dc00a79a0516a6ae0fb16206237aa +Subproject commit cd6a5e409d2d53677c4f121c0307c22ee7b907b2 diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index e9c58b66..42464941 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -200,6 +200,7 @@ class ShadowsocksNatService extends Service with BaseService { val cmd = new ArrayBuffer[String] cmd += (Path.BASE + "ss-local" , "-b" , "127.0.0.1" + , "-t" , "600" , "-c" , Path.BASE + "ss-local-nat.conf" , "-f" , Path.BASE + "ss-local-nat.pid") @@ -223,6 +224,7 @@ class ShadowsocksNatService extends Service with BaseService { val cmd = new ArrayBuffer[String] cmd += (Path.BASE + "ss-tunnel" , "-u" + , "-t" , "10" , "-b" , "127.0.0.1" , "-L" , "8.8.8.8:53" , "-c" , Path.BASE + "ss-tunnel-nat.conf" @@ -244,6 +246,7 @@ class ShadowsocksNatService extends Service with BaseService { val cmdBuf = new ArrayBuffer[String] cmdBuf += (Path.BASE + "ss-tunnel" , "-u" + , "-t" , "10" , "-b" , "127.0.0.1" , "-l" , "8163" , "-L" , "8.8.8.8:53" diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index c83f1620..dd8b7a80 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -116,9 +116,10 @@ class ShadowsocksVpnService extends VpnService with BaseService { val cmd = new ArrayBuffer[String] cmd +=(Path.BASE + "ss-local", "-u" - , "-b", "127.0.0.1" - , "-c", Path.BASE + "ss-local-vpn.conf" - , "-f", Path.BASE + "ss-local-vpn.pid") + , "-b" , "127.0.0.1" + , "-t" , "600" + , "-c" , Path.BASE + "ss-local-vpn.conf" + , "-f" , Path.BASE + "ss-local-vpn.pid") if (Utils.isLollipopOrAbove && config.route != Route.ALL) { cmd += "--acl" @@ -139,11 +140,12 @@ class ShadowsocksVpnService extends VpnService with BaseService { val cmd = new ArrayBuffer[String] cmd +=(Path.BASE + "ss-tunnel" , "-u" - , "-b", "127.0.0.1" - , "-l", "8163" - , "-L", "8.8.8.8:53" - , "-c", Path.BASE + "ss-tunnel-vpn.conf" - , "-f", Path.BASE + "ss-tunnel-vpn.pid") + , "-t" , "10" + , "-b" , "127.0.0.1" + , "-l" , "8163" + , "-L" , "8.8.8.8:53" + , "-c" , Path.BASE + "ss-tunnel-vpn.conf" + , "-f" , Path.BASE + "ss-tunnel-vpn.pid") if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) Console.runCommand(cmd.mkString(" "))