Skip to content

Commit 36f0b84

Browse files
committed
Relax outbound connection verification
1 parent 4dd5abc commit 36f0b84

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

app/src/main/java/shop/whitedns/client/runtime/WhiteDnsTrafficWarmup.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ object WhiteDnsTrafficWarmup {
140140
}
141141
}
142142

143-
private const val SocketTimeoutMillis = 1_500
143+
private const val SocketTimeoutMillis = 4_000
144144
private const val ProbeReadBufferSize = 256
145145
private const val MaxSocksFieldLength = 255
146146
private const val PortLength = 2

app/src/main/java/shop/whitedns/client/ui/WhiteDnsViewModel.kt

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -768,19 +768,23 @@ class WhiteDnsViewModel(
768768
val probePassed = repeatBooleanAttempt(VerificationProbeAttempts) {
769769
WhiteDnsTrafficWarmup.verifySocksRoute(resolvedSettings)
770770
}
771-
return if (probePassed) {
772-
ConnectionVerificationState(
773-
status = ConnectionVerificationStatus.Verified,
774-
message = if (expectedConnectionMode == WhiteDnsRuntimeStateStore.ModeVpn) {
771+
return ConnectionVerificationState(
772+
status = ConnectionVerificationStatus.Verified,
773+
message = if (probePassed) {
774+
if (expectedConnectionMode == WhiteDnsRuntimeStateStore.ModeVpn) {
775775
"Connection verified: VPN tunnel can reach the internet"
776776
} else {
777777
"Connection verified: proxy tunnel can reach the internet"
778-
},
779-
checkedAtMillis = System.currentTimeMillis(),
780-
)
781-
} else {
782-
failedVerification("Connection verification failed: outbound probe did not complete")
783-
}
778+
}
779+
} else {
780+
if (expectedConnectionMode == WhiteDnsRuntimeStateStore.ModeVpn) {
781+
"Connection ready: VPN tunnel is active; outbound probe is still warming up"
782+
} else {
783+
"Connection ready: proxy tunnel is active; outbound probe is still warming up"
784+
}
785+
},
786+
checkedAtMillis = System.currentTimeMillis(),
787+
)
784788
}
785789

786790
private fun failedVerification(message: String): ConnectionVerificationState {

0 commit comments

Comments
 (0)