Start writing to the ICE transport as soon as we have any validated p…

…air.
jitsi · Oct 1, 2024 · 2b3f078 · 2b3f078
1 parent 8ec0b62
commit 2b3f078
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt
@@ -420,7 +420,7 @@ class Endpoint @JvmOverloads constructor(
             }
         }
         iceTransport.eventHandler = object : IceTransport.EventHandler {
-            override fun connected() {
+            override fun writeable() {
                 logger.info("ICE connected")
                 transceiver.setOutgoingPacketHandler(object : PacketHandler {
                     override fun processPacket(packetInfo: PacketInfo) {
@@ -431,6 +431,9 @@ class Endpoint @JvmOverloads constructor(
                 TaskPools.IO_POOL.execute(dtlsTransport::startDtlsHandshake)
             }
 
+            override fun connected() {
+            }
+
             override fun failed() {
             }
 

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/Relay.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/Relay.kt
@@ -384,7 +384,7 @@ class Relay @JvmOverloads constructor(
             }
         }
         iceTransport.eventHandler = object : IceTransport.EventHandler {
-            override fun connected() {
+            override fun writeable() {
                 logger.info("ICE connected")
                 transceiver.setOutgoingPacketHandler(object : PacketHandler {
                     override fun processPacket(packetInfo: PacketInfo) {
@@ -395,6 +395,8 @@ class Relay @JvmOverloads constructor(
                 TaskPools.IO_POOL.execute(dtlsTransport::startDtlsHandshake)
             }
 
+            override fun connected() {}
+
             override fun failed() {}
 
             override fun consentUpdated(time: Instant) {

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/transport/ice/IceTransport.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/transport/ice/IceTransport.kt
@@ -94,6 +94,13 @@ class IceTransport @JvmOverloads constructor(
     @JvmField
     var eventHandler: EventHandler? = null
 
+    /**
+     * Whether or not it is possible to write to this [IceTransport].
+     *
+     * This happens as soon as any candidate pair is validated, and happens (usually) before iceConnected.
+     */
+    private val iceWriteable = AtomicBoolean(false)
+
     /**
      * Whether or not this [IceTransport] has connected.
      */
@@ -106,6 +113,8 @@ class IceTransport @JvmOverloads constructor(
 
     fun hasFailed(): Boolean = iceFailed.get()
 
+    fun isWriteable(): Boolean = iceWriteable.get()
+
     fun isConnected(): Boolean = iceConnected.get()
 
     /**
@@ -282,6 +291,7 @@ class IceTransport @JvmOverloads constructor(
         put("nominationStrategy", IceConfig.config.nominationStrategy.toString())
         put("advertisePrivateCandidates", IceConfig.config.advertisePrivateCandidates)
         put("closed", !running.get())
+        put("iceWriteable", iceWriteable.get())
         put("iceConnected", iceConnected.get())
         put("iceFailed", iceFailed.get())
         putAll(packetStats.toJson())
@@ -400,7 +410,11 @@ class IceTransport @JvmOverloads constructor(
     }
 
     private fun iceStreamPairChanged(ev: PropertyChangeEvent) {
-        if (IceMediaStream.PROPERTY_PAIR_CONSENT_FRESHNESS_CHANGED == ev.propertyName) {
+        if (IceMediaStream.PROPERTY_PAIR_VALIDATED == ev.propertyName) {
+            if (iceWriteable.compareAndSet(false, true)) {
+                eventHandler?.writeable()
+            }
+        } else if (IceMediaStream.PROPERTY_PAIR_CONSENT_FRESHNESS_CHANGED == ev.propertyName) {
             /* TODO: Currently ice4j only triggers this event for the selected
              * pair, but should we double-check the pair anyway?
              */
@@ -464,6 +478,11 @@ class IceTransport @JvmOverloads constructor(
     }
 
     interface EventHandler {
+        /**
+         * Notify the event handler that it is possible to write to the ICE stack
+         */
+        fun writeable()
+
         /**
          * Notify the event handler that ICE connected successfully
          */