diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index 2183ee32..bdef7894 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -265,7 +265,7 @@ class ShadowsocksNatService extends Service with BaseService { val reject = ConfigUtils.getRejectList(getContext, application) val blackList = ConfigUtils.getBlackList(getContext, application) ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "127.0.0.1", 8153, - Path.BASE + "pdnsd-nat.pid", reject, blackList, reject, blackList, 8163) + Path.BASE + "pdnsd-nat.pid", reject, blackList, 8163) } else { ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "127.0.0.1", 8153, Path.BASE + "pdnsd-nat.pid", 8163) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index 586b862a..e06a0363 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -157,7 +157,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { val reject = ConfigUtils.getRejectList(getContext, application) val blackList = ConfigUtils.getBlackList(getContext, application) ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "0.0.0.0", 8153, - Path.BASE + "pdnsd-vpn.pid", reject, blackList, reject, blackList, 8163) + Path.BASE + "pdnsd-vpn.pid", reject, blackList, 8163) } else { ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "0.0.0.0", 8153, Path.BASE + "pdnsd-vpn.pid", 8163) diff --git a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala index 327f319d..cae1f567 100644 --- a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala +++ b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala @@ -168,20 +168,6 @@ object ConfigUtils { |} | |server { - | label= "secure"; - | port = 443; - | ip = 208.67.220.220,113.20.8.17,77.66.84.233,176.56.237.171; - | timeout = 3; - | reject = %s; - | reject_policy = fail; - | reject_recursively = on; - | exclude = %s; - | policy = included; - | uptest = none; - | preset = on; - |} - | - |server { | label = "local-server"; | ip = 127.0.0.1; | port = %d;