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

refactor lan again

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

37
src/lan.rs
View File

@ -113,16 +113,6 @@ fn get_mac(_ip: &IpAddr) -> String {
"".to_owned() "".to_owned()
} }
fn get_all_ipv4s() -> ResultType<Vec<Ipv4Addr>> {
let mut ipv4s = Vec::new();
for interface in default_net::get_interfaces() {
for ipv4 in &interface.ipv4 {
ipv4s.push(ipv4.addr.clone());
}
}
Ok(ipv4s)
}
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
fn get_mac_by_ip(ip: &IpAddr) -> ResultType<String> { fn get_mac_by_ip(ip: &IpAddr) -> ResultType<String> {
for interface in default_net::get_interfaces() { for interface in default_net::get_interfaces() {
@ -164,10 +154,16 @@ fn get_ipaddr_by_peer<A: ToSocketAddrs>(peer: A) -> Option<IpAddr> {
}; };
} }
fn create_broadcast_sockets() -> ResultType<Vec<UdpSocket>> { fn create_broadcast_sockets() -> Vec<UdpSocket> {
let mut ipv4s = Vec::new();
for interface in default_net::get_interfaces() {
for ipv4 in &interface.ipv4 {
ipv4s.push(ipv4.addr.clone());
}
}
ipv4s.push(Ipv4Addr::UNSPECIFIED); // for robustness
let mut sockets = Vec::new(); let mut sockets = Vec::new();
if let Ok(addresses) = get_all_ipv4s() { for v4_addr in ipv4s {
for v4_addr in addresses {
// removing v4_addr.is_private() check, https://github.com/rustdesk/rustdesk/issues/4663 // 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 let Ok(s) = UdpSocket::bind(SocketAddr::from((v4_addr, 0))) {
if s.set_broadcast(true).is_ok() { if s.set_broadcast(true).is_ok() {
@ -175,19 +171,13 @@ fn create_broadcast_sockets() -> ResultType<Vec<UdpSocket>> {
} }
} }
} }
} else { sockets
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)?;
sockets.push(s);
}
Ok(sockets)
} }
fn send_query() -> ResultType<Vec<UdpSocket>> { fn send_query() -> ResultType<Vec<UdpSocket>> {
let sockets = create_broadcast_sockets()?; let sockets = create_broadcast_sockets();
if sockets.is_empty() { if sockets.is_empty() {
bail!("Found no ipv4 addresses"); bail!("Found no bindable ipv4 addresses");
} }
let mut msg_out = Message::new(); let mut msg_out = Message::new();
@ -196,9 +186,10 @@ fn send_query() -> ResultType<Vec<UdpSocket>> {
..Default::default() ..Default::default()
}; };
msg_out.set_peer_discovery(peer); msg_out.set_peer_discovery(peer);
let out = msg_out.write_to_bytes()?;
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 {
allow_err!(socket.send_to(&msg_out.write_to_bytes()?, maddr)); allow_err!(socket.send_to(&out, maddr));
} }
log::info!("discover ping sent"); log::info!("discover ping sent");
Ok(sockets) Ok(sockets)