brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle duplicated upstreams

Browse Source
This commit is contained in:
Mygod
2018-10-03 13:46:44 +08:00
parent 55405742a8
commit 1eb84bf1a3
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mobile/src/main/java/be/mygod/vpnhotspot/net/Routing.kt
View File

@@ -69,40 +69,39 @@ class Routing(val downstream: String, ownerAddress: InterfaceAddress? = null) {
var hasMasquerade = false var hasMasquerade = false
private abstract inner class Upstream : UpstreamMonitor.Callback { private val upstreams = HashSet<String>()
private open inner class Upstream(val priority: Int) : UpstreamMonitor.Callback {
var subrouting: Subrouting? = null var subrouting: Subrouting? = null
var dns: List<InetAddress> = emptyList() var dns: List<InetAddress> = emptyList()
override fun onAvailable(ifname: String, dns: List<InetAddress>) { override fun onAvailable(ifname: String, dns: List<InetAddress>) {
if (!upstreams.add(ifname)) return
val subrouting = subrouting
if (subrouting == null) this.subrouting = try {
Subrouting(this@Routing, priority, ifname)
} catch (e: Exception) {
SmartSnackbar.make(e.localizedMessage).show()
Timber.w(e)
null
} else check(subrouting.upstream == ifname)
this.dns = dns this.dns = dns
updateDnsRoute() updateDnsRoute()
} }
override fun onLost() { override fun onLost() {
val subrouting = subrouting ?: return val subrouting = subrouting ?: return
check(upstreams.remove(subrouting.upstream))
subrouting.close() subrouting.close()
TrafficRecorder.update() // record stats before removing rules to prevent stats losing TrafficRecorder.update() // record stats before removing rules to prevent stats losing
subrouting.revert() subrouting.revert()
this.subrouting = null this.subrouting = null
} }
} }
private val fallbackUpstream = object : Upstream() { private val fallbackUpstream = object : Upstream(RULE_PRIORITY_UPSTREAM_FALLBACK) {
override fun onAvailable(ifname: String, dns: List<InetAddress>) {
val subrouting = subrouting
if (subrouting == null) this.subrouting = try {
Subrouting(this@Routing, RULE_PRIORITY_UPSTREAM_FALLBACK, ifname)
} catch (e: Exception) {
SmartSnackbar.make(e.localizedMessage).show()
Timber.w(e)
null
} else check(subrouting.upstream == ifname)
super.onAvailable(ifname, dns)
}
override fun onFallback() { override fun onFallback() {
check(subrouting == null) check(subrouting == null)
subrouting = try { subrouting = try {
Subrouting(this@Routing, RULE_PRIORITY_UPSTREAM_FALLBACK) Subrouting(this@Routing, priority)
} catch (e: Exception) { } catch (e: Exception) {
SmartSnackbar.make(e.localizedMessage).show() SmartSnackbar.make(e.localizedMessage).show()
Timber.w(e) Timber.w(e)
@@ -111,19 +110,7 @@ class Routing(val downstream: String, ownerAddress: InterfaceAddress? = null) {
updateDnsRoute() updateDnsRoute()
} }
} }
private val upstream = object : Upstream() { private val upstream = Upstream(RULE_PRIORITY_UPSTREAM)
override fun onAvailable(ifname: String, dns: List<InetAddress>) {
val subrouting = subrouting
if (subrouting == null) this.subrouting = try {
Subrouting(this@Routing, RULE_PRIORITY_UPSTREAM, ifname)
} catch (e: Exception) {
SmartSnackbar.make(e.localizedMessage).show()
Timber.w(e)
null
} else check(subrouting.upstream == ifname)
super.onAvailable(ifname, dns)
}
}
fun ipForward() = transaction.exec("echo 1 >/proc/sys/net/ipv4/ip_forward") fun ipForward() = transaction.exec("echo 1 >/proc/sys/net/ipv4/ip_forward")