From 6a30da671df1bd28c187f5219fe9bc830f280b78 Mon Sep 17 00:00:00 2001 From: Erimel Date: Sun, 17 Sep 2023 21:23:37 -0400 Subject: [PATCH] Filter out !isSiteLocalAddress from addresses (#847) Co-authored-by: Uriel --- .../src/main/java/dev/slimevr/protocol/rpc/setup/RPCUtil.kt | 6 +++--- .../dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/core/src/main/java/dev/slimevr/protocol/rpc/setup/RPCUtil.kt b/server/core/src/main/java/dev/slimevr/protocol/rpc/setup/RPCUtil.kt index 4b970612d..d2b2e5b95 100644 --- a/server/core/src/main/java/dev/slimevr/protocol/rpc/setup/RPCUtil.kt +++ b/server/core/src/main/java/dev/slimevr/protocol/rpc/setup/RPCUtil.kt @@ -5,9 +5,9 @@ import java.net.NetworkInterface object RPCUtil { @JvmStatic fun getLocalIp(): String = - NetworkInterface.getNetworkInterfaces().asSequence().first { - it.isUp && !it.isLoopback && !it.isVirtual && it.interfaceAddresses.any { it.broadcast != null } + NetworkInterface.getNetworkInterfaces().asSequence().first { netInt -> + netInt.isUp && !netInt.isLoopback && !netInt.isVirtual && netInt.interfaceAddresses.any { it.broadcast != null } }.interfaceAddresses.first { - it.broadcast != null + it.address.isSiteLocalAddress && it.broadcast != null }.address.hostAddress } diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt index df502df97..8606d5da8 100644 --- a/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt +++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt @@ -41,7 +41,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker }.map { // This ignores IPv6 addresses it.broadcast - }.filterNotNull().map { InetSocketAddress(it, this.port) }.toList() + }.filter { it != null && it.isSiteLocalAddress }.map { InetSocketAddress(it, this.port) }.toList() } catch (e: Exception) { LogManager.severe("[TrackerServer] Can't enumerate network interfaces", e) emptyList()