From 63d2ec7b028d44ff73e73d588569dcc5e41932dc Mon Sep 17 00:00:00 2001 From: Mygod Date: Sat, 27 Aug 2016 23:31:50 +0800 Subject: [PATCH] Revert "Fix #838 #839" This reverts commit 32f4d6af4711b10b04811627370e520d2a681900. Never mind then! I changed my mind. --- .../scala/com/github/shadowsocks/utils/TcpFastOpen.scala | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/utils/TcpFastOpen.scala b/src/main/scala/com/github/shadowsocks/utils/TcpFastOpen.scala index 6451b14b..2a7b898f 100644 --- a/src/main/scala/com/github/shadowsocks/utils/TcpFastOpen.scala +++ b/src/main/scala/com/github/shadowsocks/utils/TcpFastOpen.scala @@ -28,8 +28,8 @@ object TcpFastOpen { file.canRead && (Utils.readAllLines(file).toInt & 1) > 0 } - def enabled(value: Boolean) = { - val result = Shell.run("su", Array( + def enabled(value: Boolean) = + Shell.run("su", Array( "if echo " + (if (value) 3 else 0) + " > /proc/sys/net/ipv4/tcp_fastopen; then", " success=-1", " if mount -o rw,remount /dev/block/platform/msm_sdcc.1/by-name/system /system; then", @@ -46,7 +46,5 @@ object TcpFastOpen { " fi", "else", " echo Failed.", - "fi"), null, true) - if (result == null) "Root access failed." else result.asScala.mkString("\n") - } + "fi"), null, true).asScala.mkString("\n") }