Integrate UDP mux support for ICE

Author: k0nserv

Cargo.toml

@@ -17,7 +17,7 @@ sdp = "0.4.0"
 mdns = { package = "webrtc-mdns", version = "0.4.0" }
 stun = "0.4.0"
 turn = "0.5.1"
-ice = { package = "webrtc-ice", version = "0.5.1" }
+ice = { package = "webrtc-ice", version = "0.6.1" }
 dtls = { package = "webrtc-dtls", version = "0.5.0" }
 rtp = "0.6.1"
 rtcp = "0.6.1"

src/api/setting_engine/mod.rs

@@ -7,6 +7,7 @@ use dtls::extension::extension_use_srtp::SrtpProtectionProfile;
 use ice::agent::agent_config::InterfaceFilterFn;
 use ice::mdns::MulticastDnsMode;
 use ice::network_type::NetworkType;
+use ice::udp_network::UDPNetwork;
 
 use crate::error::{Error, Result};
 
@@ -15,12 +16,6 @@ use std::sync::Arc;
 use tokio::time::Duration;
 use util::vnet::net::*;
 
-#[derive(Default, Clone)]
-pub struct EphemeralUDP {
-    pub port_min: u16,
-    pub port_max: u16,
-}
-
 #[derive(Default, Clone)]
 pub struct Detach {
     pub data_channels: bool,
@@ -62,7 +57,6 @@ pub struct ReplayProtection {
 /// use-cases without deviating from the WebRTC API elsewhere.
 #[derive(Default, Clone)]
 pub struct SettingEngine {
-    pub(crate) ephemeral_udp: EphemeralUDP,
     pub(crate) detach: Detach,
     pub(crate) timeout: Timeout,
     pub(crate) candidates: Candidates,
@@ -77,6 +71,7 @@ pub struct SettingEngine {
     //iceTCPMux                                 :ice.TCPMux,?
     //iceUDPMux                                 :ice.UDPMux,?
     //iceProxyDialer                            :proxy.Dialer,?
+    pub(crate) udp_network: UDPNetwork,
     pub(crate) disable_media_engine_copy: bool,
     pub(crate) srtp_protection_profiles: Vec<SrtpProtectionProfile>,
     pub(crate) receive_mtu: usize,
@@ -139,17 +134,8 @@ impl SettingEngine {
         self.timeout.ice_relay_acceptance_min_wait = t;
     }
 
-    /// set_ephemeral_udp_port_range limits the pool of ephemeral ports that
-    /// ICE UDP connections can allocate from. This affects both host candidates,
-    /// and the local address of server reflexive candidates.
-    pub fn set_ephemeral_udp_port_range(&mut self, port_min: u16, port_max: u16) -> Result<()> {
-        if port_max < port_min {
-            return Err(ice::Error::ErrPort.into());
-        }
-
-        self.ephemeral_udp.port_min = port_min;
-        self.ephemeral_udp.port_max = port_max;
-        Ok(())
+    pub fn set_udp_network(&mut self, udp_network: UDPNetwork) {
+        self.udp_network = udp_network;
     }
 
     /// set_lite configures whether or not the ice agent should be a lite agent

src/api/setting_engine/setting_engine_test.rs

@@ -5,34 +5,6 @@ use crate::peer_connection::peer_connection_test::*;
 use crate::rtp_transceiver::rtp_codec::RTPCodecType;
 use std::sync::atomic::Ordering;
 
-#[test]
-fn test_set_ephemeral_udpport_range() -> Result<()> {
-    let mut s = SettingEngine::default();
-
-    assert!(
-        !(s.ephemeral_udp.port_min != 0 || s.ephemeral_udp.port_max != 0),
-        "SettingEngine defaults aren't as expected."
-    );
-
-    // set bad ephemeral ports
-    assert!(
-        s.set_ephemeral_udp_port_range(3000, 2999).is_err(),
-        "Setting engine should fail bad ephemeral ports."
-    );
-
-    assert!(
-        s.set_ephemeral_udp_port_range(3000, 4000).is_ok(),
-        "Setting engine failed valid port range"
-    );
-
-    assert!(
-        !(s.ephemeral_udp.port_min != 3000 || s.ephemeral_udp.port_max != 4000),
-        "Setting engine ports do not reflect expected range"
-    );
-
-    Ok(())
-}
-
 #[test]
 fn test_set_connection_timeout() -> Result<()> {
     let mut s = SettingEngine::default();

src/ice_transport/ice_gatherer.rs

@@ -104,10 +104,9 @@ impl RTCIceGatherer {
         }
 
         let mut config = ice::agent::agent_config::AgentConfig {
+            udp_network: self.setting_engine.udp_network.clone(),
             lite: self.setting_engine.candidates.ice_lite,
             urls: self.validated_servers.clone(),
-            port_min: self.setting_engine.ephemeral_udp.port_min,
-            port_max: self.setting_engine.ephemeral_udp.port_max,
             disconnected_timeout: self.setting_engine.timeout.ice_disconnected_timeout,
             failed_timeout: self.setting_engine.timeout.ice_failed_timeout,
             keepalive_interval: self.setting_engine.timeout.ice_keepalive_interval,
@@ -129,7 +128,6 @@ impl RTCIceGatherer {
             local_ufrag: self.setting_engine.candidates.username_fragment.clone(),
             local_pwd: self.setting_engine.candidates.password.clone(),
             //TODO: TCPMux:                 self.setting_engine.iceTCPMux,
-            //TODO: UDPMux:                 self.setting_engine.iceUDPMux,
             //TODO: ProxyDialer:            self.setting_engine.iceProxyDialer,
             ..Default::default()
         };