Merge pull request #46 from FAForever/maintenance/update-ice4j

Update ice4j to mainline and off custom fork
FAForever · Nov 10, 2023 · 4c79734 · 4c79734
2 parents 3ec3cc7 + 24c4e0e
commit 4c79734
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/ice-adapter/build.gradle b/ice-adapter/build.gradle
@@ -29,13 +29,10 @@ dependencies {
     annotationProcessor("info.picocli:picocli-codegen:$picocliVersion")
     implementation("info.picocli:picocli:$picocliVersion")
 
-//    implementation "org.jitsi:ice4j:1.0"
-//    implementation 'com.github.jitsi:ice4j:59693a4894'
-    implementation("com.github.Geosearchef:ice4j:52c8e4bcef")
+    implementation("org.jitsi:ice4j:3.0-66-g1c60acc")
     implementation("com.github.faforever:JJsonRpc:37669e0fed")
     implementation("com.google.guava:guava:$guavaVersion")
     implementation("org.slf4j:slf4j-api:1.7.36")
-//    implementation "org.slf4j:slf4j-simple:1.7.25"
     implementation("ch.qos.logback:logback-classic:$logbackVersion")
     implementation("ch.qos.logback:logback-core:$logbackVersion")
     implementation("org.java-websocket:Java-WebSocket:1.5.3")

diff --git a/ice-adapter/src/main/java/com/faforever/iceadapter/ice/PeerIceModule.java b/ice-adapter/src/main/java/com/faforever/iceadapter/ice/PeerIceModule.java
@@ -113,7 +113,7 @@ private void gatherCandidates() {
 
         CompletableFuture<Void> gatheringFuture = CompletableFuture.runAsync(() -> {
             try {
-                component = agent.createComponent(mediaStream, Transport.UDP, MINIMUM_PORT + (int) (Math.random() * 999.0), MINIMUM_PORT, MINIMUM_PORT + 1000);
+                component = agent.createComponent(mediaStream,MINIMUM_PORT + (int) (Math.random() * 999.0), MINIMUM_PORT, MINIMUM_PORT + 1000);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }

diff --git a/ice-adapter/src/test/java/IceTest.java b/ice-adapter/src/test/java/IceTest.java
@@ -96,7 +96,7 @@ public static void main(String args[]) throws IOException {
         int preferredPort = scan.nextInt();
 
         IceMediaStream mediaStream = agent.createMediaStream("mainStream");
-        Component component = agent.createComponent(mediaStream, Transport.UDP, preferredPort, preferredPort, preferredPort + 100);
+        Component component = agent.createComponent(mediaStream, preferredPort, preferredPort, preferredPort + 100);
 
         //------------------------------------------------------------
         //agent done