mdns

crates/lanspread-mdns/src/lib.rs

@@ -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:?}");

crates/lanspread-peer/src/lib.rs

@@ -1700,7 +1700,8 @@ async fn run_peer_discovery(
     log::info!("Starting peer discovery task");
 
     loop {
-        let discovery_result = discover_service(LANSPREAD_SERVICE_TYPE);
+        let ignored_addr = { *local_peer_addr.read().await };
+        let discovery_result = discover_service(LANSPREAD_SERVICE_TYPE, ignored_addr);
 
         match discovery_result {
             Ok(peer_addr) => {
@@ -1710,9 +1711,7 @@ async fn run_peer_discovery(
                 };
                 if is_self {
                     log::trace!("Ignoring self advertisement at {peer_addr}");
-                    continue;
-                }
-
+                } else {
                     log::info!("Discovered peer at: {peer_addr}");
 
                     // Add peer to database
@@ -1749,6 +1748,7 @@ async fn run_peer_discovery(
                         });
                     }
                 }
+            }
             Err(e) => {
                 log::debug!("Peer discovery error: {e}");
                 tokio::time::sleep(Duration::from_secs(5)).await;