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

Revert "fix the vpn mode"

Browse Source 
This reverts commit 3429776c31.
This commit is contained in:
Max Lv
2014-03-07 19:14:37 +08:00
parent 3429776c31
commit 5aab822dc0
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+2 -5
View File
@@ -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)
src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
+1 -1
View File
@@ -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;
|}