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

Support slow updating VPN apps

Browse Source 
Some apps create another VPN interface, then shutdown the old interface. Reason isn't quite clear but this should fix it.
This commit is contained in:
Mygod
2018-03-08 00:08:38 -08:00
parent ea4fd9f174
commit 4d58183168
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/src/main/java/be/mygod/vpnhotspot/net/VpnMonitor.kt
View File

@@ -29,12 +29,20 @@ object VpnMonitor : ConnectivityManager.NetworkCallback() {
* Obtaining ifname in onLost doesn't work so we need to cache it in onAvailable. * Obtaining ifname in onLost doesn't work so we need to cache it in onAvailable.
*/ */
private val available = HashMap<Network, String>() private val available = HashMap<Network, String>()
private var currentNetwork: Network? = null
override fun onAvailable(network: Network) { override fun onAvailable(network: Network) {
val properties = manager.getLinkProperties(network) val properties = manager.getLinkProperties(network)
val ifname = properties?.interfaceName ?: return val ifname = properties?.interfaceName ?: return
synchronized(this) { synchronized(this) {
if (available.put(network, ifname) != null) return if (available.put(network, ifname) != null) return
debugLog(TAG, "onAvailable: $ifname, ${properties.dnsServers.joinToString()}") debugLog(TAG, "onAvailable: $ifname, ${properties.dnsServers.joinToString()}")
val old = currentNetwork
if (old != null) {
val name = available[old]!!
debugLog(TAG, "Assuming old VPN interface $name is dying")
callbacks.forEach { it.onLost(name) }
}
currentNetwork = network
callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) } callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
} }
} }
@@ -42,7 +50,14 @@ object VpnMonitor : ConnectivityManager.NetworkCallback() {
override fun onLost(network: Network) = synchronized(this) { override fun onLost(network: Network) = synchronized(this) {
val ifname = available.remove(network) ?: return val ifname = available.remove(network) ?: return
debugLog(TAG, "onLost: $ifname") debugLog(TAG, "onLost: $ifname")
if (currentNetwork != network) return
val next = available.entries.firstOrNull()
currentNetwork = next?.key
callbacks.forEach { it.onLost(ifname) } callbacks.forEach { it.onLost(ifname) }
if (next == null) return
debugLog(TAG, "Switching to ${next.value} as VPN interface")
val properties = manager.getLinkProperties(next.key)
callbacks.forEach { it.onAvailable(next.value, properties.dnsServers) }
} }
fun registerCallback(callback: Callback, failfast: (() -> Unit)? = null) { fun registerCallback(callback: Callback, failfast: (() -> Unit)? = null) {