From bb499d1c0c28c0d95d1ba2e95d6742df175f24ae Mon Sep 17 00:00:00 2001
From: Robinson <robinson@dorkbox.com>
Date: Thu, 18 Aug 2022 09:35:20 +0200
Subject: [PATCH] Cleaned up common code and log output

---
 .../aeron/mediaDriver/ServerUdpDriver.kt      | 28 ++++++++-----------
 .../mediaDriver/ServerUdpPairedDriver.kt      | 23 ++++-----------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/dorkbox/network/aeron/mediaDriver/ServerUdpDriver.kt b/src/dorkbox/network/aeron/mediaDriver/ServerUdpDriver.kt
index 1aaa71f4..53290bd2 100644
--- a/src/dorkbox/network/aeron/mediaDriver/ServerUdpDriver.kt
+++ b/src/dorkbox/network/aeron/mediaDriver/ServerUdpDriver.kt
@@ -47,12 +47,19 @@ internal open class ServerUdpDriver(val listenAddress: InetAddress,
     var success: Boolean = false
     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) {
-        val isIpv4 = listenAddress is Inet4Address
-        val addressString = IP.toString(listenAddress)
 
         // 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 (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) {
-            "Listening on $address [$port|${port+1}] [$streamId|$sessionId] (reliable:$isReliable)"
+            "Listening on $prettyAddressString [$port|${port+1}] [$streamId|$sessionId] (reliable:$isReliable)"
         } else {
-            "Listening handshake on $address [$port|${port+1}] [$streamId|*] (reliable:$isReliable)"
+            "Listening handshake on $prettyAddressString [$port|${port+1}] [$streamId|*] (reliable:$isReliable)"
         }
 
         this.success = true
diff --git a/src/dorkbox/network/aeron/mediaDriver/ServerUdpPairedDriver.kt b/src/dorkbox/network/aeron/mediaDriver/ServerUdpPairedDriver.kt
index f79ff0c9..a91b74d5 100644
--- a/src/dorkbox/network/aeron/mediaDriver/ServerUdpPairedDriver.kt
+++ b/src/dorkbox/network/aeron/mediaDriver/ServerUdpPairedDriver.kt
@@ -16,13 +16,13 @@
 
 package dorkbox.network.aeron.mediaDriver
 
-import dorkbox.netUtil.IP
 import dorkbox.netUtil.IPv4
 import dorkbox.netUtil.IPv6
 import dorkbox.network.aeron.AeronDriver
 import io.aeron.Publication
 import mu.KLogger
 import java.net.Inet4Address
+import java.net.Inet6Address
 import java.net.InetAddress
 
 /**
@@ -48,7 +48,6 @@ internal class ServerUdpPairedDriver(
     ) {
 
     lateinit var publication: Publication
-    private val listenAddressString = IP.toString(listenAddress)
 
     override fun build(aeronDriver: AeronDriver, logger: KLogger) {
         // 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) {
-            if (listenAddress == IPv4.WILDCARD) {
-                listenAddress.hostAddress
-            } else {
-                IPv4.WILDCARD.hostAddress + "/" + listenAddress.hostAddress
-            }
+        val remoteAddressString = if (isIpV4) {
+            IPv4.toString(remoteAddress as Inet4Address)
         } else {
-            IP.toString(listenAddress)
+            IPv6.toString(remoteAddress as Inet6Address)
         }
 
-        this.info = if (sessionId != AeronDriver.RESERVED_SESSION_ID_INVALID) {
-            "NEW222 Listening on $address [$port|${port+1}] [$streamId|$sessionId] (reliable:$isReliable)"
-        } else {
-            "NEW Listening handshake on $address [$port|${port+1}] [$streamId|*] (reliable:$isReliable)"
-        }
+        this.info = "$remoteAddressString via $prettyAddressString [$port|${port+1}] [$streamId|$sessionId] (reliable:$isReliable)"
 
         this.success = true
         this.publication = publication
         this.subscription = aeronDriver.addSubscription(subscriptionUri, streamId)
     }
-
-//    override fun toString(): String {
-//        return "$remoteAddressString [$port|$publicationPort] [$streamId|$sessionId] (reliable:$isReliable)"
-//    }
 }