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

fix the build

Browse Source
This commit is contained in:
Max Lv
2014-03-07 13:27:59 +08:00
parent 1beb175957
commit 056bd56d90
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/values/configs.xml
+4 -3
View File
File diff suppressed because one or more lines are too long
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+6 -6
View File
@@ -113,9 +113,9 @@ class ShadowsocksVpnService extends VpnService with BaseService {
version
}
def isByass(info: SubnetUtils.SubnetInfo): Boolean = {
info.isInRange(config.proxy) || info.isInRange("114.114.114.114")
|| info.isInRange("114.114.115.115")
def isByass(util: SubnetUtils): Boolean = {
val info = util.getInfo
info.isInRange(config.proxy) || info.isInRange("114.114.114.114") || info.isInRange("114.114.115.115")
}
def startVpn() {
@@ -138,7 +138,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
}
}
gfwList.foreach(cidr => {
val net = new SubnetUtils(cidr).getInfo
val net = new SubnetUtils(cidr)
if (!isByass(net)) {
val addr = cidr.split('/')
builder.addRoute(addr(0), addr(1).toInt)
@@ -149,7 +149,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
if (i != 26 && i != 127) {
val addr = i.toString + ".0.0.0"
val cidr = addr + "/8"
val net = new SubnetUtils(cidr).getInfo
val net = new SubnetUtils(cidr)
if (!isByass(net)) {
if (!InetAddress.getByName(addr).isSiteLocalAddress) {
@@ -159,7 +159,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
for (j <- 0 to 255) {
val subAddr = i.toString + "." + j.toString + ".0.0"
val subCidr = subAddr + "/16"
val subNet = new SubnetUtils(subCidr).getInfo
val subNet = new SubnetUtils(subCidr)
if (!isByass(subNet)) {
if (!InetAddress.getByName(subAddr).isSiteLocalAddress) {
builder.addRoute(subAddr, 16)