summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-21 22:55:05 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-23 13:05:40 +0000
commit66631ae9cfdaa8e6faba3abb3f3a40a18310fe04 (patch)
tree9371d4e6948e8aa8ca5a442f6e0147163056c961 /android
parent1e514b22e961f8f29941fdd8188e0874cc9b8e11 (diff)
downloadmullvadvpn-66631ae9cfdaa8e6faba3abb3f3a40a18310fe04.tar.xz
mullvadvpn-66631ae9cfdaa8e6faba3abb3f3a40a18310fe04.zip
Return boolean to indicate if tunnel is up
Allows the tunnel state machine to determine if it is blocking connections when entering the error state.
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index 93c7f32c36..a0dfd029f2 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -55,11 +55,13 @@ open class TalpidVpnService : VpnService() {
}
}
- fun createTunIfClosed() {
+ fun createTunIfClosed(): Boolean {
synchronized(this) {
if (activeTunDevice == null) {
activeTunDevice = createTun(currentTunConfig)
}
+
+ return activeTunDevice?.let { tunFd -> tunFd > 0 } ?: false
}
}