ice: Remove unused MulticastDnsMode:Unspecified variant.

Author: jxs

ice/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Breaking changes
+
+* remove non used `MulticastDnsMode::Unspecified` variant [#XXX](https://github.com/webrtc-rs/webrtc/pull/XXX):
+
 ## v0.9.0
 
 * Increased minimum support rust version to `1.60.0`.

ice/src/agent/mod.rs

@@ -125,10 +125,7 @@ impl Agent {
             return Err(Error::ErrInvalidMulticastDnshostName);
         }
 
-        let mut mdns_mode = config.multicast_dns_mode;
-        if mdns_mode == MulticastDnsMode::Unspecified {
-            mdns_mode = MulticastDnsMode::QueryOnly;
-        }
+        let mdns_mode = config.multicast_dns_mode;
 
         let mdns_conn =
             match create_multicast_dns(mdns_mode, &mdns_name, &config.multicast_dns_dest_addr) {

ice/src/mdns/mod.rs

@@ -14,8 +14,6 @@ use uuid::Uuid;
 /// Represents the different Multicast modes that ICE can run.
 #[derive(PartialEq, Eq, Debug, Copy, Clone)]
 pub enum MulticastDnsMode {
-    Unspecified,
-
     /// Means remote mDNS candidates will be discarded, and local host candidates will use IPs.
     Disabled,
 
@@ -28,7 +26,7 @@ pub enum MulticastDnsMode {
 
 impl Default for MulticastDnsMode {
     fn default() -> Self {
-        Self::Unspecified
+        Self::QueryOnly
     }
 }
 
@@ -44,9 +42,11 @@ pub(crate) fn create_multicast_dns(
     mdns_name: &str,
     dest_addr: &str,
 ) -> Result<Option<Arc<DnsConn>>> {
-    if mdns_mode == MulticastDnsMode::Disabled {
-        return Ok(None);
-    }
+    let local_names = match mdns_mode {
+        MulticastDnsMode::QueryOnly => vec![],
+        MulticastDnsMode::QueryAndGather => vec![mdns_name.to_owned()],
+        MulticastDnsMode::Disabled => return Ok(None),
+    };
 
     let addr = if dest_addr.is_empty() {
         //TODO: why DEFAULT_DEST_ADDR doesn't work on Mac/Win?
@@ -60,21 +60,12 @@ pub(crate) fn create_multicast_dns(
     };
     log::info!("mDNS is using {} as dest_addr", addr);
 
-    match mdns_mode {
-        MulticastDnsMode::QueryOnly => {
-            let conn = DnsConn::server(addr, Config::default())?;
-            Ok(Some(Arc::new(conn)))
-        }
-        MulticastDnsMode::QueryAndGather => {
-            let conn = DnsConn::server(
-                addr,
-                Config {
-                    local_names: vec![mdns_name.to_owned()],
-                    ..Config::default()
-                },
-            )?;
-            Ok(Some(Arc::new(conn)))
-        }
-        _ => Ok(None),
-    }
+    let conn = DnsConn::server(
+        addr,
+        Config {
+            local_names,
+            ..Config::default()
+        },
+    )?;
+    Ok(Some(Arc::new(conn)))
 }

webrtc/src/ice_transport/ice_gatherer.rs

@@ -103,13 +103,7 @@ impl RTCIceGatherer {
             _ => CandidateType::Unspecified,
         };
 
-        let mut mdns_mode = self.setting_engine.candidates.multicast_dns_mode;
-        if mdns_mode != ice::mdns::MulticastDnsMode::Disabled
-            && mdns_mode != ice::mdns::MulticastDnsMode::QueryAndGather
-        {
-            // If enum is in state we don't recognized default to MulticastDNSModeQueryOnly
-            mdns_mode = ice::mdns::MulticastDnsMode::QueryOnly;
-        }
+        let mdns_mode = self.setting_engine.candidates.multicast_dns_mode;
 
         let mut config = ice::agent::agent_config::AgentConfig {
             udp_network: self.setting_engine.udp_network.clone(),