Skip to content

fix(vpn): retain stopJob and reset isStopping synchronously #44

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

Merged
Hidden-Node merged 1 commit into from
Jul 24, 2026
Merged

fix(vpn): retain stopJob and reset isStopping synchronously #44

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
20 changes: 14 additions & 6 deletions android/app/src/main/java/com/masterdns/vpn/service/MasterDnsVpnService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class MasterDnsVpnService : VpnService() {

private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
private var connectJob: Job? = null
private var stopJob: Job? = null
private var vpnInterface: ParcelFileDescriptor? = null
private var goClientJob: Job? = null
private var httpProxyJob: Job? = null
Expand Down Expand Up @@ -465,10 +466,10 @@ class MasterDnsVpnService : VpnService() {
if (isStopping) return
isStopping = true

// Use a separate scope so that serviceScope.cancel() in onDestroy()
// does not kill this coroutine mid-cleanup.
val stopScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
stopScope.launch {
// plan 014: retain the cleanup Job in stopJob so a process pause/resume
// can't GC it mid-teardown; onDestroy() joins it before cancelling scope.
if (stopJob?.isActive == true) return
stopJob = serviceScope.launch {
try {
connectJob?.cancel()
VpnManager.appendLog("VPN stop requested")
Expand Down Expand Up @@ -550,9 +551,10 @@ class MasterDnsVpnService : VpnService() {
VpnManager.updateState(VpnManager.VpnState.DISCONNECTED)
VpnManager.stopTrafficMonitor()
runCatching { stopSelf() }
} finally {
// plan 014: reset synchronously so connect() doesn't race stopSelf()
isStopping = false
}
// NOTE: isStopping intentionally stays true until onDestroy() completes.
// This prevents onDestroy() from double-closing already-freed resources.
}
}

Expand All @@ -573,6 +575,12 @@ class MasterDnsVpnService : VpnService() {
}

override fun onDestroy() {
// plan 014: let any in-flight stopVpn() finish before cancelling serviceScope.
val inFlightStop = stopJob
if (inFlightStop != null && inFlightStop.isActive) {
kotlinx.coroutines.runBlocking { inFlightStop.join() }
}

// Normal path: stopVpn() already ran — Go layer guards make re-calls no-ops.
// Force-kill path: stopVpn() was never called, so do full cleanup.
if (!isStopping) {
Expand Down
4 changes: 3 additions & 1 deletion android/app/src/main/java/com/masterdns/vpn/util/VpnManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ object VpnManager {
* Start the VPN service.
*/
fun connect(context: Context, profile: ProfileEntity) {
if (_state.value == VpnState.CONNECTED || _state.value == VpnState.CONNECTING) return
if (_state.value == VpnState.CONNECTED ||
_state.value == VpnState.CONNECTING ||
_state.value == VpnState.DISCONNECTING) return

updateState(VpnState.CONNECTING)
clearError()
Expand Down
Loading