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

Also allow ifname changes I guess??

Browse Source
This commit is contained in:
Mygod
2018-10-12 12:34:06 +08:00
parent 47366b982e
commit 46f7ae7dd0
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt
View File

@@ -42,13 +42,22 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
val oldProperties = currentLinkProperties!! val oldProperties = currentLinkProperties!!
currentLinkProperties = properties currentLinkProperties = properties
val ifname = properties.interfaceName val ifname = properties.interfaceName
if (ifname == null) { when {
onLost(network) ifname == null -> {
return Timber.w(RuntimeException("interfaceName became null: $oldProperties -> $properties"))
onLost(network)
}
ifname != oldProperties.interfaceName -> {
Timber.w(RuntimeException("interfaceName changed: $oldProperties -> $properties"))
callbacks.forEach {
it.onLost()
it.onAvailable(ifname, properties.dnsServers)
}
}
properties.dnsServers != oldProperties.dnsServers -> {
callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
}
} }
check(ifname == oldProperties.interfaceName)
if (properties.dnsServers != oldProperties.dnsServers)
callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
} }
override fun onLost(network: Network) { override fun onLost(network: Network) {

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

@@ -3,6 +3,7 @@ package be.mygod.vpnhotspot.net.monitor
import android.net.* import android.net.*
import be.mygod.vpnhotspot.App.Companion.app import be.mygod.vpnhotspot.App.Companion.app
import be.mygod.vpnhotspot.debugLog import be.mygod.vpnhotspot.debugLog
import timber.log.Timber
object VpnMonitor : UpstreamMonitor() { object VpnMonitor : UpstreamMonitor() {
private const val TAG = "VpnMonitor" private const val TAG = "VpnMonitor"
@@ -45,13 +46,22 @@ object VpnMonitor : UpstreamMonitor() {
if (currentNetwork != network) return if (currentNetwork != network) return
val oldProperties = available.put(network, properties)!! val oldProperties = available.put(network, properties)!!
val ifname = properties.interfaceName val ifname = properties.interfaceName
if (ifname == null) { when {
onLost(network) ifname == null -> {
return Timber.w(RuntimeException("interfaceName became null: $oldProperties -> $properties"))
onLost(network)
}
ifname != oldProperties.interfaceName -> {
Timber.w(RuntimeException("interfaceName changed: $oldProperties -> $properties"))
callbacks.forEach {
it.onLost()
it.onAvailable(ifname, properties.dnsServers)
}
}
properties.dnsServers != oldProperties.dnsServers -> {
callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
}
} }
check(ifname == oldProperties.interfaceName)
if (properties.dnsServers != oldProperties.dnsServers)
callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
} }
} }