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

update pdnsd

Browse Source
This commit is contained in:
Max Lv
2014-04-13 09:50:08 +08:00
parent 06934b3e34
commit f60bb4fccd
113 changed files with 22 additions and 36078 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
+2 -2
View File
@@ -288,8 +288,8 @@ class ShadowsocksNatService extends Service with BaseService {
ab.append("killall -9 ss-local")
ab.append("kill -9 `cat " + Path.BASE + "ss-tunnel.pid`")
ab.append("killall -9 ss-tunnel")
ab.append("kill -9 `cat " + Path.BASE + "pdnsd.pid`")
ab.append("killall -9 pdnsd")
ab.append("kill -15 `cat " + Path.BASE + "pdnsd.pid`")
ab.append("killall -15 pdnsd")
Console.runRootCommand(ab.toArray)
}
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+2 -2
View File
@@ -263,8 +263,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
ab.append("killall -9 ss-local")
ab.append("kill -9 `cat " + Path.BASE + "tun2socks.pid`")
ab.append("killall -9 tun2socks")
ab.append("kill -9 `cat " + Path.BASE + "pdnsd.pid`")
ab.append("killall -9 pdnsd")
ab.append("kill -15 `cat " + Path.BASE + "pdnsd.pid`")
ab.append("killall -15 pdnsd")
Console.runCommand(ab.toArray)
}
src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
+2 -2
View File
@@ -115,7 +115,7 @@ object ConfigUtils {
| preset = on;
| include = %s;
| policy = excluded;
| timeout = 3;
| timeout = 2;
|}
|
|server {
@@ -197,4 +197,4 @@ object ConfigUtils {
new Config(isGlobalProxy, isGFWList, isBypassApps, isTrafficStat, isUdpDns, profileName, proxy,
sitekey, encMethod, proxiedAppString, remotePort, localPort)
}
}
}