resolve hostname

DatL4g · Nov 16, 2024 · f5afb45 · f5afb45
1 parent 44c3286
commit f5afb45
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/src/appleMain/kotlin/dev/datlag/k2k/NetInterface.apple.kt b/src/appleMain/kotlin/dev/datlag/k2k/NetInterface.apple.kt
@@ -95,4 +95,6 @@ actual object NetInterface {
         freeifaddrs(ifa.ptr)
         return address ?: ""
     }
+
+    actual fun resolve(name: String): String = name
 }
diff --git a/src/commonMain/kotlin/dev/datlag/k2k/NetInterface.kt b/src/commonMain/kotlin/dev/datlag/k2k/NetInterface.kt
@@ -6,4 +6,5 @@ expect object NetInterface {
     // udp, no isLoopback, broadcastAddress is not null
     fun getAddresses(): ImmutableSet<String>
     fun getLocalAddress(): String
+    fun resolve(name: String): String
 }
diff --git a/src/commonMain/kotlin/dev/datlag/k2k/discover/DiscoveryServer.kt b/src/commonMain/kotlin/dev/datlag/k2k/discover/DiscoveryServer.kt
@@ -70,7 +70,7 @@ internal class DiscoveryServer : AutoCloseable {
                         val host = Constants.protobuf.decodeFromByteArray<Host>(receivedPacket).apply {
                             val inetSocketAddress = datagram.address as InetSocketAddress
 
-                            this.hostAddress = inetSocketAddress.hostname
+                            this.hostAddress = NetInterface.resolve(inetSocketAddress.hostname)
                         }
 
                         hosts.update {

diff --git a/src/jvmMain/kotlin/dev/datlag/k2k/NetAddress.kt b/src/jvmMain/kotlin/dev/datlag/k2k/NetAddress.kt
@@ -8,7 +8,7 @@ import java.net.Inet4Address
 import java.net.InetAddress
 import java.net.NetworkInterface
 
-data class NetAddress(
+data class NetAddress internal constructor(
     val address: String?,
     val isLoopback: Boolean,
     val isVirtual: Boolean,
@@ -33,7 +33,9 @@ data class NetAddress(
         up: Boolean
     ) : this(
         address = scopeCatching {
-            inetAddress.hostAddress?.trim()
+            scopeCatching {
+                InetAddress.getByName(inetAddress.hostAddress?.trim())
+            }.getOrNull()?.hostAddress?.ifBlank { null } ?: inetAddress.hostAddress?.trim()
         }.getOrNull()?.ifBlank { null },
         isLoopback = loopback ?: scopeCatching {
             inetAddress.isLoopbackAddress

diff --git a/src/jvmMain/kotlin/dev/datlag/k2k/NetInterface.jvm.kt b/src/jvmMain/kotlin/dev/datlag/k2k/NetInterface.jvm.kt
@@ -37,4 +37,10 @@ actual object NetInterface {
             ?: candidates.firstNotNullOfOrNull { it.address }
             ?: InetAddress.getLocalHost().hostAddress
     }
+
+    actual fun resolve(name: String): String {
+        return scopeCatching {
+            InetAddress.getByName(name).hostAddress
+        }.getOrNull()?.ifBlank { null } ?: name
+    }
 }