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

Ensure Subrouting is closed if register fails

Browse Source
This commit is contained in:
Mygod
2018-12-29 00:48:39 +08:00
parent 1ced7566f5
commit eda1e48ede
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/src/main/java/be/mygod/vpnhotspot/net/Subrouting.kt
View File

@@ -62,8 +62,12 @@ class Subrouting(private val parent: Routing, priority: Int, val upstream: Strin
init { init {
Timber.d("Subrouting initialized from %s to %s", parent.downstream, upstream) Timber.d("Subrouting initialized from %s to %s", parent.downstream, upstream)
Timber.d(Thread.currentThread().stackTrace.joinToString("\n")) try {
IpNeighbourMonitor.registerCallback(this) IpNeighbourMonitor.registerCallback(this)
} catch (e: Exception) {
close()
throw e
}
} }
/** /**
@@ -72,7 +76,6 @@ class Subrouting(private val parent: Routing, priority: Int, val upstream: Strin
override fun close() { override fun close() {
IpNeighbourMonitor.unregisterCallback(this) IpNeighbourMonitor.unregisterCallback(this)
Timber.d("Subrouting closed from %s to %s", parent.downstream, upstream) Timber.d("Subrouting closed from %s to %s", parent.downstream, upstream)
Timber.d(Thread.currentThread().stackTrace.joinToString("\n"))
} }
override fun onIpNeighbourAvailable(neighbours: List<IpNeighbour>) = synchronized(parent) { override fun onIpNeighbourAvailable(neighbours: List<IpNeighbour>) = synchronized(parent) {