From d2a527ed0eb374be42542695edfb185023ab4c86 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Thu, 18 Aug 2016 17:49:48 +0800 Subject: [PATCH] Fix #816 --- kcptun/kcptun | 2 +- .../scala/com/github/shadowsocks/ShadowsocksNatService.scala | 2 +- .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kcptun/kcptun b/kcptun/kcptun index ca9807a2..e8349a30 160000 --- a/kcptun/kcptun +++ b/kcptun/kcptun @@ -1 +1 @@ -Subproject commit ca9807a2f30e3c6c0d7eb25ee865fb46fb6aef89 +Subproject commit e8349a306372700f5e5ccbda1592ced01760088c diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index bb59d1d8..b38e8fd6 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -128,7 +128,7 @@ class ShadowsocksNatService extends BaseService { if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) - kcptunProcess = new GuardedProcess(cmd.mkString(" ").split(" ").toSeq).start() + kcptunProcess = new GuardedProcess(cmd.mkString(" ").split("[ ]{1,}").toSeq).start() } def startDNSTunnel() { diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index 7a052de4..3fab3b74 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -216,7 +216,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) - kcptunProcess = new GuardedProcess(cmd.mkString(" ").split(" ").toSeq).start() + kcptunProcess = new GuardedProcess(cmd.mkString(" ").split("[ ]{1,}").toSeq).start() } def startShadowsocksUDPDaemon() {