ddidderr/lanspread
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

mdns

Browse Source
This commit is contained in:
ddidderr
2025-11-13 20:50:43 +01:00
parent 4b8a361b9a
commit 97bd87640e
2 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/lanspread-mdns/src/lib.rs
+24 -4
View File
@@ -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
+36 -36
View File
@@ -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,43 +1711,42 @@ 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}");
log::info!("Discovered peer at: {peer_addr}");
// Add peer to database
let is_new_peer = {
let mut db = peer_game_db.write().await;
let peer_addresses = db.get_peer_addresses();
if peer_addresses.contains(&peer_addr) {
false
} else {
db.add_peer(peer_addr);
true
}
};
if is_new_peer {
// Notify UI about new peer
if let Err(e) = tx_notify_ui.send(PeerEvent::PeerDiscovered(peer_addr)) {
log::error!("Failed to send PeerDiscovered event: {e}");
}
// Request games from this peer
let tx_notify_ui_clone = tx_notify_ui.clone();
let peer_game_db_clone = peer_game_db.clone();
tokio::spawn(async move {
if let Err(e) = request_games_from_peer(
peer_addr,
tx_notify_ui_clone,
peer_game_db_clone,
)
.await
{
log::error!("Failed to request games from peer {peer_addr}: {e}");
// Add peer to database
let is_new_peer = {
let mut db = peer_game_db.write().await;
let peer_addresses = db.get_peer_addresses();
if peer_addresses.contains(&peer_addr) {
false
} else {
db.add_peer(peer_addr);
true
}
});
};
if is_new_peer {
// Notify UI about new peer
if let Err(e) = tx_notify_ui.send(PeerEvent::PeerDiscovered(peer_addr)) {
log::error!("Failed to send PeerDiscovered event: {e}");
}
// Request games from this peer
let tx_notify_ui_clone = tx_notify_ui.clone();
let peer_game_db_clone = peer_game_db.clone();
tokio::spawn(async move {
if let Err(e) = request_games_from_peer(
peer_addr,
tx_notify_ui_clone,
peer_game_db_clone,
)
.await
{
log::error!("Failed to request games from peer {peer_addr}: {e}");
}
});
}
}
}
Err(e) => {