From 5aab822dc0b5cd2c648ebae9b2ff4ad2e15b47f6 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 7 Mar 2014 19:14:37 +0800 Subject: [PATCH] Revert "fix the vpn mode" This reverts commit 3429776c313b02bf6634a1fb49b9e4d8b4dd4a2d. --- .../com/github/shadowsocks/ShadowsocksVpnService.scala | 7 ++----- .../scala/com/github/shadowsocks/utils/ConfigUtils.scala | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index 84e81243..edd5c1ed 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -72,7 +72,6 @@ class ShadowsocksVpnService extends VpnService with BaseService { var receiver: BroadcastReceiver = null var apps: Array[ProxiedApp] = null var config: Config = null - var dns = Utils.getDNS val handler: Handler = new Handler() @@ -92,7 +91,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { Path.BASE + "ss-tunnel.pid") .format(config.proxy, config.remotePort, 8153, config.sitekey, config.encMethod) } else { - val conf = ConfigUtils.PDNSD.format("0.0.0.0", getString(R.string.exclude), dns) + val conf = ConfigUtils.PDNSD.format("0.0.0.0", getString(R.string.exclude), Utils.getDNS) ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => { p.println(conf) }) @@ -116,13 +115,11 @@ class ShadowsocksVpnService extends VpnService with BaseService { def isByass(util: SubnetUtils): Boolean = { val info = util.getInfo - info.isInRange(config.proxy) || info.isInRange("114.114.114.114") || info.isInRange(dns) + info.isInRange(config.proxy) || info.isInRange("114.114.114.114") || info.isInRange(Utils.getDNS) } def startVpn() { - dns = Utils.getDNS - val builder = new Builder() builder .setSession(config.profileName) diff --git a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala index 7688f119..e89a43c8 100644 --- a/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala +++ b/src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala @@ -79,7 +79,7 @@ object ConfigUtils { | |server { | label = "google-servers"; - | ip = 8.8.8.8, 8.8.4.4, 208.67.222.222, 208.67.220.220; + | ip = 8.8.8.8, 8.8.4.4; | exclude = %s; | timeout = 5; |}