From c0514ee169a3b6f5fc83495e63d15adda716a6a5 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sat, 18 Oct 2014 10:46:54 +0800 Subject: [PATCH] disable bypass feature of pdnsd --- .../com/github/shadowsocks/ShadowsocksNatService.scala | 9 +-------- .../com/github/shadowsocks/ShadowsocksVpnService.scala | 5 +---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index 9d30e727..f52d0652 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -150,10 +150,7 @@ class ShadowsocksNatService extends Service with BaseService { Core.sstunnel(cmd.toArray) } else { 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 => { p.println(conf) @@ -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)) 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) { val chn_list: Array[String] = getResources.getStringArray(R.array.chn_list) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index cf11025f..4361b7b2 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -95,10 +95,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { def startDnsDaemon() { 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 => { p.println(conf)