Make allowHost, allowReflexive and allowRelay configurable

FAForever · Sep 6, 2023 · e1e636a · e1e636a
1 parent 008b5ea
commit e1e636a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/kia-cli/src/main/kotlin/com/faforever/ice/KiaApplication.kt b/kia-cli/src/main/kotlin/com/faforever/ice/KiaApplication.kt
@@ -53,8 +53,17 @@ class KiaApplication : Callable<Int> {
     )
     private var telemetryServer: String = ""
 
+    @Option(names = ["--allow-host"], description = ["???"])
+    private var allowHost: Boolean = true
+
+    @Option(names = ["--allow-reflexive"], description = ["???"])
+    private var allowReflexive: Boolean = true
+
+    @Option(names = ["--allow-relay"], description = ["???"])
+    private var allowRelay: Boolean = true
+
     override fun call(): Int {
-        val iceOptions = IceOptions(userId, userName, gameId, forceRelay, lobbyPort, gpgnetPort, telemetryServer)
+        val iceOptions = IceOptions(userId, userName, gameId, forceRelay, lobbyPort, gpgnetPort, telemetryServer, allowHost, allowReflexive, allowRelay)
         logger.info { "Starting ICE adapter with options: $iceOptions" }
         val iceAdapter = IceAdapter(iceOptions, emptyList(), {})
         iceAdapter.start()

diff --git a/kia-lib/src/main/kotlin/com/faforever/ice/IceAdapter.kt b/kia-lib/src/main/kotlin/com/faforever/ice/IceAdapter.kt
@@ -60,7 +60,7 @@ class IceAdapter(
         logger.debug { "joinGame: remotePlayerLogin=$remotePlayerLogin, remotePlayerId=$remotePlayerId" }
 
         val remotePeerOrchestrator = RemotePeerOrchestrator(
-            localPlayerId = iceOptions.userId,
+            iceOptions = iceOptions,
             remotePlayerId = remotePlayerId,
             localOffer = false,
             coturnServers = coturnServers,
@@ -83,7 +83,7 @@ class IceAdapter(
         logger.debug { "connectToPeer: remotePlayerLogin=$remotePlayerLogin, remotePlayerId=$remotePlayerId" }
 
         val remotePeerOrchestrator = RemotePeerOrchestrator(
-            localPlayerId = iceOptions.userId,
+            iceOptions = iceOptions,
             remotePlayerId = remotePlayerId,
             localOffer = offer,
             coturnServers = coturnServers,

diff --git a/kia-lib/src/main/kotlin/com/faforever/ice/IceOptions.kt b/kia-lib/src/main/kotlin/com/faforever/ice/IceOptions.kt
@@ -9,4 +9,7 @@ data class IceOptions(
     val lobbyPort: Int,
     val gpgnetPort: Int,
     val telemetryServer: String,
+    val allowHost: Boolean,
+    val allowReflexive: Boolean,
+    val allowRelay: Boolean,
 )
diff --git a/kia-lib/src/main/kotlin/com/faforever/ice/ice4j/AgentWrapper.kt b/kia-lib/src/main/kotlin/com/faforever/ice/ice4j/AgentWrapper.kt
@@ -1,5 +1,6 @@
 package com.faforever.ice.ice4j
 
+import com.faforever.ice.IceOptions
 import com.faforever.ice.peering.CoturnServer
 import dev.failsafe.Failsafe
 import dev.failsafe.Timeout
@@ -18,7 +19,7 @@ import java.time.Duration
 private val logger = KotlinLogging.logger {}
 
 class AgentWrapper(
-    private val localPlayerId: Int,
+    private val iceOptions: IceOptions,
     private val remotePlayerId: Int,
     private val localOffer: Boolean,
     private val coturnServers: List<CoturnServer>,
@@ -104,13 +105,13 @@ class AgentWrapper(
                 }
 
                 val candidates = CandidateUtil.packCandidates(
-                    sourceId = localPlayerId,
+                    sourceId = iceOptions.userId,
                     destinationId = remotePlayerId,
                     agent = agent!!,
                     component = it.result,
-                    allowHost = true, // TODO: Make configurable
-                    allowReflexive = true, // TODO: Make configurable
-                    allowRelay = true, // TODO: Make configurable
+                    allowHost = iceOptions.allowHost,
+                    allowReflexive = iceOptions.allowReflexive,
+                    allowRelay = iceOptions.allowRelay,
                 )
                 onCandidatesGathered(candidates)
             }

diff --git a/kia-lib/src/main/kotlin/com/faforever/ice/peering/RemotePeerOrchestrator.kt b/kia-lib/src/main/kotlin/com/faforever/ice/peering/RemotePeerOrchestrator.kt
@@ -1,5 +1,6 @@
 package com.faforever.ice.peering
 
+import com.faforever.ice.IceOptions
 import com.faforever.ice.ice4j.AgentWrapper
 import com.faforever.ice.ice4j.CandidatesMessage
 import com.faforever.ice.ice4j.IceState
@@ -17,7 +18,7 @@ import java.util.concurrent.TimeUnit
 private val logger = KotlinLogging.logger {}
 
 class RemotePeerOrchestrator(
-    private val localPlayerId: Int,
+    private val iceOptions: IceOptions,
     private val remotePlayerId: Int,
     private val localOffer: Boolean,
     private val coturnServers: List<CoturnServer>,
@@ -56,7 +57,7 @@ class RemotePeerOrchestrator(
                 udpSocketBridge = UdpSocketBridge(toRemoteQueue::put, "player-$remotePlayerId")
                     .apply { start() }
                 agent = AgentWrapper(
-                    localPlayerId = localPlayerId,
+                    iceOptions = iceOptions,
                     remotePlayerId = remotePlayerId,
                     localOffer = localOffer,
                     coturnServers = coturnServers,

diff --git a/kia-lib/src/test/kotlin/com/faforever/ice/IceAdapterIT.kt b/kia-lib/src/test/kotlin/com/faforever/ice/IceAdapterIT.kt
@@ -34,6 +34,9 @@ class IceAdapterIT {
                 5001,
                 5002,
                 "telemetryServer",
+                true,
+                true,
+                true,
             ),
             coturnServers = coturnServers,
             candidatesTestForwarder::onCandidatesFromA1,
@@ -51,6 +54,9 @@ class IceAdapterIT {
                 6001,
                 6002,
                 "telemetryServer",
+                true,
+                true,
+                true,
             ),
             coturnServers = coturnServers,
             candidatesTestForwarder::onCandidatesFromA2,