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

Cleaned up common code and log output

Browse Source
This commit is contained in:
Robinson 2022-08-18 09:35:20 +02:00
parent 2ef56be699
commit bb499d1c0c
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/dorkbox/network/aeron/mediaDriver/ServerUdpDriver.kt
View File

@ -47,12 +47,19 @@ internal open class ServerUdpDriver(val listenAddress: InetAddress,
var success: Boolean = false var success: Boolean = false
override val type = "udp" override val type = "udp"
private val isIpv4 = listenAddress is Inet4Address
protected val listenAddressString = IP.toString(listenAddress)
protected val prettyAddressString = when (listenAddress) {
IPv4.WILDCARD -> listenAddressString
IPv6.WILDCARD -> IPv4.WILDCARD.hostAddress + "/" + listenAddressString
else -> listenAddressString
}
override fun build(aeronDriver: AeronDriver, logger: KLogger) { override fun build(aeronDriver: AeronDriver, logger: KLogger) {
val isIpv4 = listenAddress is Inet4Address
val addressString = IP.toString(listenAddress)
// Create a subscription at the given address and port, using the given stream ID. // Create a subscription at the given address and port, using the given stream ID.
val subscriptionUri = uri("udp", sessionId, isReliable).endpoint(isIpv4, addressString, port) val subscriptionUri = uri("udp", sessionId, isReliable).endpoint(isIpv4, listenAddressString, port)
if (logger.isTraceEnabled) { if (logger.isTraceEnabled) {
if (isIpv4) { if (isIpv4) {
@ -62,21 +69,10 @@ internal open class ServerUdpDriver(val listenAddress: InetAddress,
} }
} }
val address = if (listenAddress == IPv4.WILDCARD || listenAddress == IPv6.WILDCARD) {
if (listenAddress == IPv4.WILDCARD) {
listenAddress.hostAddress
} else {
IPv4.WILDCARD.hostAddress + "/" + listenAddress.hostAddress
}
} else {
IP.toString(listenAddress)
}
this.info = if (sessionId != AeronDriver.RESERVED_SESSION_ID_INVALID) { this.info = if (sessionId != AeronDriver.RESERVED_SESSION_ID_INVALID) {
"Listening on $address [$port|${port+1}] [$streamId|$sessionId] (reliable:$isReliable)" "Listening on $prettyAddressString [$port|${port+1}] [$streamId|$sessionId] (reliable:$isReliable)"
} else { } else {
"Listening handshake on $address [$port|${port+1}] [$streamId|*] (reliable:$isReliable)" "Listening handshake on $prettyAddressString [$port|${port+1}] [$streamId|*] (reliable:$isReliable)"
} }
this.success = true this.success = true

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

@ -16,13 +16,13 @@
package dorkbox.network.aeron.mediaDriver package dorkbox.network.aeron.mediaDriver
import dorkbox.netUtil.IP
import dorkbox.netUtil.IPv4 import dorkbox.netUtil.IPv4
import dorkbox.netUtil.IPv6 import dorkbox.netUtil.IPv6
import dorkbox.network.aeron.AeronDriver import dorkbox.network.aeron.AeronDriver
import io.aeron.Publication import io.aeron.Publication
import mu.KLogger import mu.KLogger
import java.net.Inet4Address import java.net.Inet4Address
import java.net.Inet6Address
import java.net.InetAddress import java.net.InetAddress
/** /**
@ -48,7 +48,6 @@ internal class ServerUdpPairedDriver(
) { ) {
lateinit var publication: Publication lateinit var publication: Publication
private val listenAddressString = IP.toString(listenAddress)
override fun build(aeronDriver: AeronDriver, logger: KLogger) { override fun build(aeronDriver: AeronDriver, logger: KLogger) {
// connection timeout of 0 doesn't matter. it is not used by the server // connection timeout of 0 doesn't matter. it is not used by the server
@ -82,28 +81,16 @@ internal class ServerUdpPairedDriver(
} }
} }
val address = if (listenAddress == IPv4.WILDCARD || listenAddress == IPv6.WILDCARD) { val remoteAddressString = if (isIpV4) {
if (listenAddress == IPv4.WILDCARD) { IPv4.toString(remoteAddress as Inet4Address)
listenAddress.hostAddress
} else {
IPv4.WILDCARD.hostAddress + "/" + listenAddress.hostAddress
}
} else { } else {
IP.toString(listenAddress) IPv6.toString(remoteAddress as Inet6Address)
} }
this.info = if (sessionId != AeronDriver.RESERVED_SESSION_ID_INVALID) { this.info = "$remoteAddressString via $prettyAddressString [$port|${port+1}] [$streamId|$sessionId] (reliable:$isReliable)"
"NEW222 Listening on $address [$port|${port+1}] [$streamId|$sessionId] (reliable:$isReliable)"
} else {
"NEW Listening handshake on $address [$port|${port+1}] [$streamId|*] (reliable:$isReliable)"
}
this.success = true this.success = true
this.publication = publication this.publication = publication
this.subscription = aeronDriver.addSubscription(subscriptionUri, streamId) this.subscription = aeronDriver.addSubscription(subscriptionUri, streamId)
} }
// override fun toString(): String {
// return "$remoteAddressString [$port|$publicationPort] [$streamId|$sessionId] (reliable:$isReliable)"
// }
} }