Skip to content

[Enhancement] Check if tunnel is active when opening the app in Kernel Mode. #1236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zaptyp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Enhancement] Check if tunnel is active when opening the app in Kernel Mode. #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,20 @@ class TunnelManager(
tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
}
}
if (currentSettings.appMode == AppMode.KERNEL && tunnels != null) {
val alreadyStartedNames =
tunnels.filter { it.isActive }.map { it.name }.toSet()
val kernelRunning =
lifecycleManagers[AppMode.KERNEL]?.runningTunnelNames() ?: emptySet()
tunnels
.filter { conf ->
conf.name in kernelRunning && conf.name !in alreadyStartedNames
}
.forEach { conf ->
Timber.i("Kernel orphan detected: ${conf.name} is running but not active in DB — re-attaching")
startTunnel(conf)
}
}
}

private suspend fun restoreAutoTunnel(autoTunnelSettings: AutoTunnelSettings) {
Expand Down
38 changes: 30 additions & 8 deletions app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/backend/KernelTunnel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class KernelTunnel(private val runConfigHelper: RunConfigHelper, private val bac
TunnelBackend {

private val runtimeTunnels = ConcurrentHashMap<Int, Tunnel>()
private val runtimeConfigs = ConcurrentHashMap<Int, com.wireguard.config.Config>()

private fun validateWireGuardInterfaceName(name: String): Result<Unit> {
if (name.isEmpty() || name.length > 15)
Expand Down Expand Up @@ -59,9 +60,24 @@ class KernelTunnel(private val runConfigHelper: RunConfigHelper, private val bac
stateChannel.consumeAsFlow().collect { state -> trySend(state.asTunnelState()) }
}

val runConfig = try {
runConfigHelper.buildWgRunConfig(tunnelConfig)
} catch (e: Exception) {
Timber.Forest.e(e, "Failed to build run config for ${tunnelConfig.name}")
runtimeTunnels.remove(tunnelConfig.id)
consumerJob.cancel()
stateChannel.close()
throw InvalidConfig()
}
runtimeConfigs[tunnelConfig.id] = runConfig

try {
val runConfig = runConfigHelper.buildWgRunConfig(tunnelConfig)
backend.setState(runtimeTunnel, Tunnel.State.UP, runConfig)
if (backend.runningTunnelNames.contains(tunnelConfig.name)) {
Timber.Forest.i("Kernel tunnel ${tunnelConfig.name} is already running (likely process-death re-attach) — skipping setState(UP)")
launch { stateChannel.send(Tunnel.State.UP) }
} else {
backend.setState(runtimeTunnel, Tunnel.State.UP, runConfig)
}
} catch (e: TimeoutCancellationException) {
Timber.Forest.e("Startup timed out for ${tunnelConfig.name}")
throw DnsFailure()
Expand All @@ -76,14 +92,17 @@ class KernelTunnel(private val runConfigHelper: RunConfigHelper, private val bac
}

awaitClose {
val ownedConfig = runtimeConfigs.remove(tunnelConfig.id)
runtimeTunnels.remove(tunnelConfig.id)
try {
backend.setState(runtimeTunnel, Tunnel.State.DOWN, null)
if (ownedConfig != null) {
backend.setState(runtimeTunnel, Tunnel.State.DOWN, ownedConfig)
}
} catch (e: BackendException) {
// Errors are emitted by caller (lifecycle manager)
} finally {
consumerJob.cancel()
stateChannel.close()
runtimeTunnels.remove(tunnelConfig.id)
trySend(TunnelStatus.Down)
}
}
Expand Down Expand Up @@ -116,13 +135,16 @@ class KernelTunnel(private val runConfigHelper: RunConfigHelper, private val bac
}

override suspend fun forceStopTunnel(tunnelId: Int) {
val runtimeTunnel = runtimeTunnels[tunnelId] ?: return
val runtimeTunnel = runtimeTunnels.remove(tunnelId) ?: return
val config = runtimeConfigs.remove(tunnelId)
try {
backend.setState(runtimeTunnel, Tunnel.State.DOWN, null)
if (config != null) {
backend.setState(runtimeTunnel, Tunnel.State.DOWN, config)
} else {
Timber.w("No cached config for tunnel $tunnelId — skipping setState(DOWN) in forceStop")
}
} catch (e: BackendException) {
Timber.Forest.e(e, "Force stop failed for $tunnelId")
} finally {
runtimeTunnels.remove(tunnelId)
}
}
}
Loading