From 434cc7bacb85858ea027e1e6bcdf07e16cd47a77 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Sun, 9 Feb 2025 19:47:07 +0100 Subject: [PATCH] dns util: don't resolve ip addresses This just times out. Not needed. --- src/main/java/de/bixilon/minosoft/util/DNSUtil.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/util/DNSUtil.kt b/src/main/java/de/bixilon/minosoft/util/DNSUtil.kt index b72d20cc17..ab12c6ce02 100644 --- a/src/main/java/de/bixilon/minosoft/util/DNSUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/DNSUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2024 Moritz Zwerger + * Copyright (C) 2020-2025 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,6 +12,7 @@ */ package de.bixilon.minosoft.util +import com.google.common.net.InetAddresses import de.bixilon.kutil.exception.ExceptionUtil.catchAll import de.bixilon.minosoft.protocol.address.ServerAddress import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition @@ -23,11 +24,13 @@ object DNSUtil { fun resolveServerAddress(hostname: String): List { val original = getServerAddress(hostname) - // TODO: Don't resolve if address is ip address if (":" in hostname) { // port provided, skip srv check return listOf(original) } + if (InetAddresses.isInetAddress(hostname)) { + return listOf(original) + } val query = "_minecraft._tcp.$hostname" val records = catchAll { Lookup(query, Type.SRV).run() } ?: return listOf(original)