dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

connectionTimeoutMS == 0, now (correctly) means wait forever

Browse Source
This commit is contained in:
nathan 2020-09-25 18:31:23 +02:00
parent 6d63401fba
commit dfec897f83
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dorkbox/network/Client.kt
View File

@ -228,6 +228,9 @@ open class Client<CONNECTION : Connection>(config: Configuration = Configuration
ipcPublicationId: Int = AeronConfig.IPC_HANDSHAKE_STREAM_ID_SUB,
ipcSubscriptionId: Int = AeronConfig.IPC_HANDSHAKE_STREAM_ID_PUB,
connectionTimeoutMS: Long = 30_000L, reliable: Boolean = true) {
require(connectionTimeoutMS >= 0) { "connectionTimeoutMS '$connectionTimeoutMS' is invalid. It must be >0" }
// this will exist ONLY if we are reconnecting via a "disconnect" callback
lockStepForReconnect.value?.doWait()

4
src/dorkbox/network/handshake/ClientHandshake.kt
View File

@ -138,7 +138,7 @@ internal class ClientHandshake<CONNECTION: Connection>(private val crypto: Crypt
val pollIdleStrategy = endPoint.config.pollIdleStrategy
val startTime = System.currentTimeMillis()
while (System.currentTimeMillis() - startTime < connectionTimeoutMS) {
while (connectionTimeoutMS == 0L || System.currentTimeMillis() - startTime < connectionTimeoutMS) {
// NOTE: regarding fragment limit size. Repeated calls to '.poll' will reassemble a fragment.
// `.poll(handler, 4)` == `.poll(handler, 2)` + `.poll(handler, 2)`
pollCount = subscription.poll(handler, 1)
@ -183,7 +183,7 @@ internal class ClientHandshake<CONNECTION: Connection>(private val crypto: Crypt
val pollIdleStrategy = endPoint.config.pollIdleStrategy
var startTime = System.currentTimeMillis()
while (System.currentTimeMillis() - startTime < connectionTimeoutMS) {
while (connectionTimeoutMS == 0L || System.currentTimeMillis() - startTime < connectionTimeoutMS) {
// NOTE: regarding fragment limit size. Repeated calls to '.poll' will reassemble a fragment.
// `.poll(handler, 4)` == `.poll(handler, 2)` + `.poll(handler, 2)`
pollCount = subscription.poll(handler, 1)