mdns

2025-11-13 20:50:43 +01:00
parent 4b8a361b9a
commit 97bd87640e
2 changed files with 60 additions and 40 deletions
@@ -47,7 +47,10 @@ impl Drop for MdnsAdvertiser {
    }
 }

-pub fn discover_service(service_type: &str) -> eyre::Result<SocketAddr> {
+pub fn discover_service(
+    service_type: &str,
+    ignore_addr: Option<SocketAddr>,
+) -> eyre::Result<SocketAddr> {
    let mdns = ServiceDaemon::new().expect("Failed to create mDNS daemon.");

    let receiver = mdns.browse(service_type)?;
@@ -67,9 +70,26 @@ pub fn discover_service(service_type: &str) -> eyre::Result<SocketAddr> {
                    continue;
                }

-                if let Some(address) = info.get_addresses().iter().next() {
-                    log::info!("Found server at {}:{}", address, info.get_port());
-                    return Ok((address.to_ip_addr(), info.get_port()).into());
+                let mut ignored_match = false;
+                for address in info.get_addresses() {
+                    let addr = SocketAddr::new(address.to_ip_addr(), info.get_port());
+
+                    if ignore_addr.is_some_and(|ignore| ignore == addr) {
+                        ignored_match = true;
+                        log::trace!("Ignoring mDNS advertisement for local server at {addr}");
+                        continue;
+                    }
+
+                    log::info!("Found server at {addr}");
+                    return Ok(addr);
+                }
+
+                if ignored_match {
+                    log::trace!(
+                        "Only saw ignored mDNS advertisements (probably ourselves) for {:?}",
+                        info.get_fullname()
+                    );
+                    continue;
                }

                log::error!("No address found in mDNS response: {info:?}");