From b2846a1beedcbceb020cb7d6c38af80d60e9eb1a Mon Sep 17 00:00:00 2001 From: magine Date: Mon, 15 Jan 2024 16:12:52 +0800 Subject: [PATCH] Disable multicast dns in native webrtc connection --- crates/node/src/logging.rs | 14 ++------------ .../transport/src/connections/native_webrtc/mod.rs | 5 ++--- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/crates/node/src/logging.rs b/crates/node/src/logging.rs index 2ae5e3d45..8f3f38ea0 100644 --- a/crates/node/src/logging.rs +++ b/crates/node/src/logging.rs @@ -149,20 +149,11 @@ pub mod node { let subscriber = Registry::default(); let level_filter = filter::LevelFilter::from_level(level.into()); - // Filter floating log of mdns - let mdns_log_filter = filter::FilterFn::new(|metadata| { - !metadata.target().starts_with("webrtc_mdns::conn") - || [276, 322] - .iter() - .all(|&line| !metadata.line().unwrap_or_default() == line) - }); - // Stderr let subscriber = subscriber.with( fmt::layer() .with_writer(std::io::stderr) - .with_filter(level_filter) - .with_filter(mdns_log_filter.clone()), + .with_filter(level_filter), ); // Jaeger @@ -178,8 +169,7 @@ pub mod node { subscriber.with(Some( tracing_opentelemetry::layer() .with_tracer(jaeger) - .with_filter(level_filter) - .with_filter(mdns_log_filter), + .with_filter(level_filter), )) } else { subscriber.with(None) diff --git a/crates/transport/src/connections/native_webrtc/mod.rs b/crates/transport/src/connections/native_webrtc/mod.rs index bcbd904ae..193c16c6f 100644 --- a/crates/transport/src/connections/native_webrtc/mod.rs +++ b/crates/transport/src/connections/native_webrtc/mod.rs @@ -199,10 +199,9 @@ impl TransportInterface for WebrtcTransport { if let Some(ref addr) = self.external_address { tracing::debug!("setting external ip {:?}", addr); setting.set_nat_1to1_ips(vec![addr.to_string()], RTCIceCandidateType::Host); - setting.set_ice_multicast_dns_mode(MulticastDnsMode::QueryOnly); + setting.set_ice_multicast_dns_mode(MulticastDnsMode::Disabled); } else { - // mDNS gathering cannot be used with 1:1 NAT IP mapping for host candidate - setting.set_ice_multicast_dns_mode(MulticastDnsMode::QueryAndGather); + setting.set_ice_multicast_dns_mode(MulticastDnsMode::Disabled); } let webrtc_api = webrtc::api::APIBuilder::new()