diff --git a/src/main/jni/redsocks b/src/main/jni/redsocks index 76348e93..3bc3f03c 160000 --- a/src/main/jni/redsocks +++ b/src/main/jni/redsocks @@ -1 +1 @@ -Subproject commit 76348e933a3a15176fdb54616d04bc6fdd3c8e0b +Subproject commit 3bc3f03c182b4c4ea5138eb7bebcaafe7cc0f53b diff --git a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala index 046eabba..a8cca796 100644 --- a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala +++ b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala @@ -47,20 +47,20 @@ import com.github.shadowsocks.aidl.Config object ConfigUtils { val SHADOWSOCKS = "{\"server\": \"%s\", \"server_port\": %d, \"local_port\": %d, \"password\": \"%s\", \"method\":\"%s\", \"timeout\": %d}" - val REDSOCKS = "base {" + - " log_debug = off;" + - " log_info = off;" + - " log = stderr;" + - " daemon = off;" + - " redirector = iptables;" + - " }\n" + - "redsocks {" + - " local_ip = 127.0.0.1;" + - " local_port = 8123;" + - " ip = 127.0.0.1;" + - " port = %d;" + - " type = socks5;" + - " }" + val REDSOCKS = "base {\n" + + " log_debug = off;\n" + + " log_info = off;\n" + + " log = stderr;\n" + + " daemon = off;\n" + + " redirector = iptables;\n" + + "}\n" + + "redsocks {\n" + + " local_ip = 127.0.0.1;\n" + + " local_port = 8123;\n" + + " ip = 127.0.0.1;\n" + + " port = %d;\n" + + " type = socks5;\n" + + "}\n" val PDNSD_LOCAL = """