hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve lan discovery

Browse Source
This commit is contained in:
rustdesk 2023-06-16 21:18:18 +08:00
parent bb93bc7d52
commit 8f2a7fdd3e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lan.rs
View File

@ -166,12 +166,20 @@ fn get_ipaddr_by_peer<A: ToSocketAddrs>(peer: A) -> Option<IpAddr> {
fn create_broadcast_sockets() -> ResultType<Vec<UdpSocket>> { fn create_broadcast_sockets() -> ResultType<Vec<UdpSocket>> {
let mut sockets = Vec::new(); let mut sockets = Vec::new();
for v4_addr in get_all_ipv4s()? { if let Ok(addresses) = get_all_ipv4s() {
// removing v4_addr.is_private() check, https://github.com/rustdesk/rustdesk/issues/4663 for v4_addr in addresses {
let s = UdpSocket::bind(SocketAddr::from((v4_addr, 0)))?; // removing v4_addr.is_private() check, https://github.com/rustdesk/rustdesk/issues/4663
if let Ok(s) = UdpSocket::bind(SocketAddr::from((v4_addr, 0))) {
if s.set_broadcast(true).is_ok() {
sockets.push(s);
}
}
}
} else {
log::info!("Failed to bind local interface in lan discovery, fallback to any address");
let s = std::net::UdpSocket::bind(SocketAddr::from(([0, 0, 0, 0], 0)))?;
s.set_broadcast(true)?; s.set_broadcast(true)?;
log::debug!("Bind socket to {}", &v4_addr); sockets.push(s);
sockets.push(s)
} }
Ok(sockets) Ok(sockets)
} }
@ -190,7 +198,7 @@ fn send_query() -> ResultType<Vec<UdpSocket>> {
msg_out.set_peer_discovery(peer); msg_out.set_peer_discovery(peer);
let maddr = SocketAddr::from(([255, 255, 255, 255], get_broadcast_port())); let maddr = SocketAddr::from(([255, 255, 255, 255], get_broadcast_port()));
for socket in &sockets { for socket in &sockets {
socket.send_to(&msg_out.write_to_bytes()?, maddr)?; allow_err!(socket.send_to(&msg_out.write_to_bytes()?, maddr));
} }
log::info!("discover ping sent"); log::info!("discover ping sent");
Ok(sockets) Ok(sockets)