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

code/comment cleanup

master
Robinson 2023-02-10 21:20:53 +01:00
parent ee25f0d2ce
commit c289f02cb9
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,7 +543,7 @@ open class Client<CONNECTION : Connection>(
// want to have 1 in-flight handshake, per connection attempt, during the aeron connection timeout
// ALSO, we want to make sure we DO NOT approach the linger timeout!
sleep(aeronDriver.driverTimeout().coerceAtLeast(TimeUnit.NANOSECONDS.toSeconds(aeronDriver.getLingerNs()*2)))
sleep(aeronDriver.driverTimeout().coerceAtLeast(TimeUnit.NANOSECONDS.toSeconds(aeronDriver.getLingerNs() * 2)))
if (e.cause is ServerException) {
val cause = e.cause!!
@ -565,7 +565,7 @@ open class Client<CONNECTION : Connection>(
// want to have 1 in-flight handshake, per connection attempt, during the aeron connection timeout
// ALSO, we want to make sure we DO NOT approach the linger timeout!
sleep(aeronDriver.driverTimeout().coerceAtLeast(TimeUnit.NANOSECONDS.toSeconds(aeronDriver.getLingerNs()*2)))
sleep(aeronDriver.driverTimeout().coerceAtLeast(TimeUnit.NANOSECONDS.toSeconds(aeronDriver.getLingerNs() * 2)))
listenerManager.notifyError(e)
throw e
@ -644,7 +644,7 @@ open class Client<CONNECTION : Connection>(
throw exception
}
// every time we connect to a server, we have to reconfigure AND reassign the readKryo.
// every time we connect to a server, we have to reconfigure AND reassign the readKryos.
readKryo = kryoConfiguredFromServer
streamingReadKryo = serialization.initKryo()

4
src/dorkbox/network/aeron/mediaDriver/ServerUdpPairedDriver.kt
View File

@ -109,6 +109,8 @@ internal class ServerUdpPairedDriver(
}
}
val subscription = aeronDriver.addSubscription(subscriptionUri, streamId)
val remoteAddressString = if (isRemoteIpv4) {
IPv4.toString(remoteAddress as Inet4Address)
} else {
@ -119,6 +121,6 @@ internal class ServerUdpPairedDriver(
this.success = true
this.publication = publication
this.subscription = aeronDriver.addSubscription(subscriptionUri, streamId)
this.subscription = subscription
}
}