Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into traffic-stat

Browse Source
This commit is contained in:
Max Lv
2015-11-18 12:40:45 +08:00
parent 6fb8db771a e50a26f341
commit 92e72830bb
7 changed files with 101 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
+6 -9
View File
@@ -51,16 +51,16 @@ object ConfigUtils {
" log_debug = off;" +
" log_info = off;" +
" log = stderr;" +
" daemon = on;" +
" 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 PDNSD_LOCAL =
"""
@@ -74,8 +74,7 @@ object ConfigUtils {
| min_ttl = 15m;
| max_ttl = 1w;
| timeout = 10;
| daemon = on;
| pid_file = %s;
| daemon = off;
|}
|
|server {
@@ -109,8 +108,7 @@ object ConfigUtils {
| min_ttl = 15m;
| max_ttl = 1w;
| timeout = 10;
| daemon = on;
| pid_file = "%s";
| daemon = off;
|}
|
|server {
@@ -153,8 +151,7 @@ object ConfigUtils {
| min_ttl = 15m;
| max_ttl = 1w;
| timeout = 10;
| daemon = on;
| pid_file = "%s";
| daemon = off;
|}
|
|server {