Commit c0514ee1 authored by Max Lv's avatar Max Lv

disable bypass feature of pdnsd

parent 06d736b2
...@@ -150,9 +150,6 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -150,9 +150,6 @@ class ShadowsocksNatService extends Service with BaseService {
Core.sstunnel(cmd.toArray) Core.sstunnel(cmd.toArray)
} else { } else {
val conf = { val conf = {
if (config.isGFWList)
ConfigUtils.PDNSD_BYPASS.format("127.0.0.1", getString(R.string.exclude))
else
ConfigUtils.PDNSD.format("127.0.0.1") ConfigUtils.PDNSD.format("127.0.0.1")
} }
ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => { ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => {
...@@ -325,10 +322,6 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -325,10 +322,6 @@ class ShadowsocksNatService extends Service with BaseService {
init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "-m owner --uid-owner " + myUid)) init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "-m owner --uid-owner " + myUid))
if (config.isGFWList) { if (config.isGFWList) {
// Bypass DNS in China
init_sb.append(cmd_bypass.replace("-p tcp -d 0.0.0.0", "-d 114.114.114.114"))
init_sb.append(cmd_bypass.replace("-p tcp -d 0.0.0.0", "-d 114.114.115.115"))
if (!isACLEnabled) if (!isACLEnabled)
{ {
val chn_list: Array[String] = getResources.getStringArray(R.array.chn_list) val chn_list: Array[String] = getResources.getStringArray(R.array.chn_list)
......
...@@ -95,9 +95,6 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -95,9 +95,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
def startDnsDaemon() { def startDnsDaemon() {
val conf = { val conf = {
if (config.isGFWList)
ConfigUtils.PDNSD_BYPASS.format("0.0.0.0", getString(R.string.exclude))
else
ConfigUtils.PDNSD.format("0.0.0.0") ConfigUtils.PDNSD.format("0.0.0.0")
} }
ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => { ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment