Speed up Android VPN stall recovery
This commit is contained in:
@@ -30,8 +30,8 @@ android {
|
|||||||
applicationId "su.cin.rapvpn"
|
applicationId "su.cin.rapvpn"
|
||||||
minSdk 26
|
minSdk 26
|
||||||
targetSdk 35
|
targetSdk 35
|
||||||
versionCode 184
|
versionCode 185
|
||||||
versionName "0.2.184"
|
versionName "0.2.185"
|
||||||
buildConfigField "String", "DEFAULT_BACKEND_URL", "\"${normalizeGradleString(defaultBackendUrl)}\""
|
buildConfigField "String", "DEFAULT_BACKEND_URL", "\"${normalizeGradleString(defaultBackendUrl)}\""
|
||||||
buildConfigField "String", "DEFAULT_CLUSTER_ID", "\"${normalizeGradleString(defaultClusterId)}\""
|
buildConfigField "String", "DEFAULT_CLUSTER_ID", "\"${normalizeGradleString(defaultClusterId)}\""
|
||||||
buildConfigField "String", "DEFAULT_ORGANIZATION_ID", "\"${normalizeGradleString(defaultOrganizationId)}\""
|
buildConfigField "String", "DEFAULT_ORGANIZATION_ID", "\"${normalizeGradleString(defaultOrganizationId)}\""
|
||||||
|
|||||||
@@ -77,9 +77,9 @@ public class RapVpnService extends VpnService {
|
|||||||
private static final int RUNTIME_DETAIL_INTERVAL_MS = 250;
|
private static final int RUNTIME_DETAIL_INTERVAL_MS = 250;
|
||||||
private static final int RUNTIME_STATUS_INTERVAL_MS = 500;
|
private static final int RUNTIME_STATUS_INTERVAL_MS = 500;
|
||||||
private static final int RUNTIME_WATCHDOG_INTERVAL_MS = 2000;
|
private static final int RUNTIME_WATCHDOG_INTERVAL_MS = 2000;
|
||||||
private static final int RUNTIME_WATCHDOG_STALE_SYNACK_MS = 15000;
|
private static final int RUNTIME_WATCHDOG_STALE_SYNACK_MS = 7000;
|
||||||
private static final int RUNTIME_WATCHDOG_RECOVERY_COOLDOWN_MS = 60000;
|
private static final int RUNTIME_WATCHDOG_RECOVERY_COOLDOWN_MS = 20000;
|
||||||
private static final int RUNTIME_WATCHDOG_HARD_RESTART_COOLDOWN_MS = 180000;
|
private static final int RUNTIME_WATCHDOG_HARD_RESTART_COOLDOWN_MS = 60000;
|
||||||
private static final int DIAGNOSTIC_WATCHDOG_INTERVAL_MS = 5000;
|
private static final int DIAGNOSTIC_WATCHDOG_INTERVAL_MS = 5000;
|
||||||
private static final int DIAGNOSTIC_STALE_RESTART_MS = 30000;
|
private static final int DIAGNOSTIC_STALE_RESTART_MS = 30000;
|
||||||
private static final int DIAGNOSTIC_RESTART_COOLDOWN_MS = 15000;
|
private static final int DIAGNOSTIC_RESTART_COOLDOWN_MS = 15000;
|
||||||
@@ -1581,6 +1581,9 @@ public class RapVpnService extends VpnService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean shouldHardRestartRuntime(long now) {
|
private boolean shouldHardRestartRuntime(long now) {
|
||||||
|
if (!PACKET_WEBSOCKET_DATAPLANE_ENABLED) {
|
||||||
|
return now - lastRuntimeWatchdogHardRestartAt >= RUNTIME_WATCHDOG_HARD_RESTART_COOLDOWN_MS;
|
||||||
|
}
|
||||||
if (runtimeWatchdogRecoveries.get() < 2) {
|
if (runtimeWatchdogRecoveries.get() < 2) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user