diff --git a/README.md b/README.md index 6825331..41c1495 100644 --- a/README.md +++ b/README.md @@ -238,7 +238,7 @@ Nothing lands without consent: the receiving machine shows a small card naming t How it finds peers, with no server and no configuration: -- Every copy sends a small UDP beacon every two seconds to multicast group `239.255.77.88:47888`, plus a legacy broadcast copy for networks that drop multicast. Beacons carry the machine name, OS, and the ephemeral TCP port that will receive files. +- Every copy sends a small UDP beacon every two seconds to multicast group `239.255.77.88:47888`, plus a directed broadcast to every active IPv4 subnet so networks that filter multicast still find peers. Beacons carry the machine name, OS, and the ephemeral TCP port that will receive files. - A beacon that has not been repeated for nine seconds drops the device from the list, so switching networks clears stale entries by itself. - File bytes move over a direct TCP connection: a `SHSF` handshake, a JSON header, the payload, then a one-byte acknowledgement, so a sender only reports success once the receiver has the whole file on disk. diff --git a/README.zh-CN.md b/README.zh-CN.md index b4b2f5a..fe1acfc 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -240,7 +240,7 @@ Shift 会持续维护局域网内其他 Shift 实例的列表,并据此提供 无需服务器、无需配置,发现机制如下: -- 每个实例每两秒向组播组 `239.255.77.88:47888` 发送一次小型 UDP 广播,并额外发送一份传统广播,以兼容丢弃组播的网络。广播内容包含机器名、操作系统,以及用于接收文件的动态 TCP 端口。 +- 每个实例每两秒向组播组 `239.255.77.88:47888` 发送一次小型 UDP 广播,并额外向每个已启用的 IPv4 子网发送定向广播,以兼容丢弃组播的网络。广播内容包含机器名、操作系统,以及用于接收文件的动态 TCP 端口。 - 九秒内没有再次收到广播,设备就会从列表移除,因此切换网络后过期条目会自动消失。 - 文件字节通过直连 TCP 传输:`SHSF` 握手、JSON 头、文件内容,最后一字节确认;只有接收方已完整落盘,发送方才会报告成功。 diff --git a/artifacts/README-macOS-universal.txt b/artifacts/README-macOS-universal.txt index 6c9c03b..9cb17d9 100644 --- a/artifacts/README-macOS-universal.txt +++ b/artifacts/README-macOS-universal.txt @@ -1,4 +1,4 @@ -Shift 0.1.5 - macOS 通用(universal) +Shift 0.1.6 - macOS 通用(universal) 本文件说明 macOS 安装包是怎么打出来的、在其它机器上会遇到什么,以及如何自己校验。 完整细节见仓库 docs/RELEASE.md 的「macOS packaging」。 @@ -32,10 +32,10 @@ macOS 权限 截图与录屏需要「屏幕录制」,输出目录需要「文件与文件夹」,带声音录屏需要 「麦克风」,「发送到设备」需要「本地网络」。Shift 会在打开截图遮罩前先检查屏幕 录制权限,被拒绝时给的是可操作的提示,而不是一张全黑截图。 - 「本地网络」被拒绝时比较安静:Shift 照常发出广播,也能回应主动找它的实例,但收 - 不到组播,于是设备列表一直是空的。若看不到其它终端,请到「系统设置 → 隐私与安全 - 性 → 本地网络」确认 Shift 是打开的;那里可能留着多条目,因为每次重新构建都是一 - 个新身份,请对准当前安装的那一个。 + 「本地网络」被拒绝时 Shift 无法可靠地发送或接收设备信标,设备列表会一直是空的。 + 若看不到其它终端,请到「系统设置 → 隐私与安全性 → 本地网络」确认当前安装的 + Shift 是打开的;那里可能留着多条目,因为每次重新构建都是一个新身份,请对准当前 + 安装的那一个。 注意:ad-hoc 构建每次的代码签名哈希都不同,而 macOS 把「屏幕录制」「本地网络」 这类授权绑在这个哈希上,所以一次升级后可能需要重新授权——这与手动重装是同一 后果。要彻底消除它,需要 Developer ID 证书加公证(见仓库 docs/ROADMAP.md 的 M5)。 diff --git a/docs/RELEASE.md b/docs/RELEASE.md index 92f816e..b5d1270 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -329,13 +329,13 @@ test, which is the proof that the check is real and not a pass-through. Checked against the live `releases` branch of this repository: -Version **0.1.5**, checked by downloading each artifact back from the raw endpoint rather +Version **0.1.6**, checked by downloading each artifact back from the raw endpoint rather than trusting the local copy: | Key | Artifact | Verified from the remote | | --- | --- | --- | -| `macos` | `Shift-macOS-universal.dmg` (55,504,368 B) | bytes downloaded, SHA256 matches the manifest | -| `windows` | `Shift-Setup-0.1.5-win-x64.exe` (24,521,557 B) | bytes downloaded, SHA256 matches the manifest | +| `macos` | `Shift-macOS-universal.dmg` (55,539,236 B) | bytes downloaded, SHA256 matches the manifest | +| `windows` | `Shift-Setup-0.1.6-win-x64.exe` (24,494,638 B) | bytes downloaded, SHA256 matches the manifest | | `windows-arm64` | not published | by choice — see "Supported release targets" | | `linux` | not published | by choice: Linux is a build target here, not a shipped product | diff --git a/package.json b/package.json index ed7ee73..d307bcb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "shift", "private": true, - "version": "0.1.5", + "version": "0.1.6", "type": "module", "scripts": { "prepare:ocr": "bash scripts/prepare-ocr-assets.sh", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e48cce1..0c1860a 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3899,7 +3899,7 @@ dependencies = [ [[package]] name = "shift" -version = "0.1.5" +version = "0.1.6" dependencies = [ "base64 0.22.1", "calamine", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index e2638d1..65cc7d7 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shift" -version = "0.1.5" +version = "0.1.6" description = "A radial file utility with screenshot, recording and OCR." authors = ["Shift Contributors"] edition = "2021" @@ -53,6 +53,9 @@ windows-sys = { version = "0.59", features = [ "Win32_UI_WindowsAndMessaging", "Win32_UI_Shell", "Win32_UI_Shell_Common", + "Win32_NetworkManagement_IpHelper", + "Win32_NetworkManagement_Ndis", + "Win32_Networking_WinSock", ] } [target.'cfg(unix)'.dependencies] diff --git a/src-tauri/src/share.rs b/src-tauri/src/share.rs index 9f21863..74b4ec4 100644 --- a/src-tauri/src/share.rs +++ b/src-tauri/src/share.rs @@ -380,6 +380,169 @@ fn prepare(sock: &UdpSocket) { let _ = sock.set_read_timeout(Some(Duration::from_millis(400))); } +/// Turn an interface address and mask into the broadcast address for that subnet. +/// Loopback, link-local and unusable masks are excluded because sending there +/// cannot reach another Shift instance. +fn directed_broadcast(address: Ipv4Addr, netmask: Ipv4Addr) -> Option { + let mask = u32::from(netmask); + if mask == 0 + || mask == u32::MAX + || address.is_unspecified() + || address.is_loopback() + || address.is_link_local() + || address.is_multicast() + { + return None; + } + Some(Ipv4Addr::from(u32::from(address) | !mask)) +} + +#[cfg(unix)] +fn interface_broadcasts() -> Vec { + let mut head = std::ptr::null_mut(); + if unsafe { libc::getifaddrs(&mut head) } != 0 { + return Vec::new(); + } + + let mut broadcasts = Vec::new(); + let mut current = head; + while !current.is_null() { + let interface = unsafe { &*current }; + current = interface.ifa_next; + + let up = interface.ifa_flags & libc::IFF_UP as libc::c_uint != 0; + let supports_broadcast = interface.ifa_flags & libc::IFF_BROADCAST as libc::c_uint != 0; + if !up || !supports_broadcast { + continue; + } + + let Some(address) = ipv4_from_sockaddr(interface.ifa_addr) else { + continue; + }; + let Some(netmask) = ipv4_from_sockaddr(interface.ifa_netmask) else { + continue; + }; + if let Some(broadcast) = directed_broadcast(address, netmask) { + broadcasts.push(broadcast); + } + } + unsafe { libc::freeifaddrs(head) }; + + broadcasts.sort_unstable(); + broadcasts.dedup(); + broadcasts +} + +#[cfg(unix)] +fn ipv4_from_sockaddr(address: *const libc::sockaddr) -> Option { + if address.is_null() || unsafe { (*address).sa_family } as i32 != libc::AF_INET { + return None; + } + let address = unsafe { &*(address as *const libc::sockaddr_in) }; + Some(Ipv4Addr::from(address.sin_addr.s_addr.to_ne_bytes())) +} + +#[cfg(target_os = "windows")] +fn interface_broadcasts() -> Vec { + use windows_sys::Win32::{ + Foundation::{ERROR_BUFFER_OVERFLOW, NO_ERROR}, + NetworkManagement::{ + IpHelper::{ + GetAdaptersAddresses, GAA_FLAG_SKIP_ANYCAST, GAA_FLAG_SKIP_DNS_SERVER, + GAA_FLAG_SKIP_MULTICAST, IP_ADAPTER_ADDRESSES_LH, + }, + Ndis::IfOperStatusUp, + }, + Networking::WinSock::{AF_INET, SOCKADDR_IN}, + }; + + const FLAGS: u32 = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER; + let family = AF_INET as u32; + let mut size = 0; + let first = unsafe { + GetAdaptersAddresses( + family, + FLAGS, + std::ptr::null(), + std::ptr::null_mut(), + &mut size, + ) + }; + if first != ERROR_BUFFER_OVERFLOW { + return Vec::new(); + } + + let mut broadcasts = Vec::new(); + loop { + // IP_ADAPTER_ADDRESSES_LH is 8-byte aligned, so backing the API's buffer + // with u64 avoids the unaligned pointer a Vec could produce. + let mut storage = vec![0_u64; size.div_ceil(8) as usize]; + let status = unsafe { + GetAdaptersAddresses( + family, + FLAGS, + std::ptr::null(), + storage.as_mut_ptr() as *mut IP_ADAPTER_ADDRESSES_LH, + &mut size, + ) + }; + if status == ERROR_BUFFER_OVERFLOW { + continue; + } + if status != NO_ERROR { + return Vec::new(); + } + + let mut adapter = storage.as_ptr() as *const IP_ADAPTER_ADDRESSES_LH; + while !adapter.is_null() { + let current = unsafe { &*adapter }; + adapter = current.Next; + if current.OperStatus != IfOperStatusUp { + continue; + } + + let mut unicast = current.FirstUnicastAddress; + while !unicast.is_null() { + let address = unsafe { &*unicast }; + unicast = address.Next; + if address.Address.lpSockaddr.is_null() { + continue; + } + + let socket = unsafe { &*(address.Address.lpSockaddr as *const SOCKADDR_IN) }; + if socket.sin_family != AF_INET as u16 { + continue; + } + let ip = Ipv4Addr::from(unsafe { socket.sin_addr.S_un.S_addr }.to_ne_bytes()); + let netmask = prefix_netmask(address.OnLinkPrefixLength.min(32)); + if let Some(broadcast) = directed_broadcast(ip, netmask) { + broadcasts.push(broadcast); + } + } + } + break; + } + + broadcasts.sort_unstable(); + broadcasts.dedup(); + broadcasts +} + +#[cfg(target_os = "windows")] +fn prefix_netmask(prefix: u8) -> Ipv4Addr { + let mask = if prefix == 0 { + 0 + } else { + u32::MAX << (32 - prefix) + }; + Ipv4Addr::from(mask) +} + +#[cfg(not(any(unix, target_os = "windows")))] +fn interface_broadcasts() -> Vec { + Vec::new() +} + /// A discovery socket on the shared beacon port. SO_REUSEPORT must be set before /// bind, so unix builds create the raw socket with libc; Windows instances fall /// back to a plain bind (one listener per machine, which is also what the @@ -432,14 +595,21 @@ fn discovery_socket() -> std::io::Result { } } -/// Reach the subnet twice: multicast is the modern path, the legacy broadcast -/// copy covers networks that drop multicast. +/// Reach every attached subnet. Multicast covers modern networks; directed +/// broadcast covers Wi-Fi and guest networks that filter multicast but still +/// forward subnet broadcasts. The limited broadcast remains a last resort. fn announce(sock: &UdpSocket, payload: &[u8]) { - for destination in [ - SocketAddr::from((IpAddr::V4(GROUP), BEACON_PORT)), - SocketAddr::from((IpAddr::V4(Ipv4Addr::BROADCAST), BEACON_PORT)), - ] { - let _ = sock.send_to(payload, destination); + let _ = sock.send_to(payload, SocketAddr::from((IpAddr::V4(GROUP), BEACON_PORT))); + + let mut broadcasts = interface_broadcasts(); + broadcasts.push(Ipv4Addr::BROADCAST); + broadcasts.sort_unstable(); + broadcasts.dedup(); + for address in broadcasts { + let _ = sock.send_to( + payload, + SocketAddr::from((IpAddr::V4(address), BEACON_PORT)), + ); } } @@ -577,15 +747,18 @@ fn probe_network(payload: &[u8]) -> (bool, bool, String) { false }; let multicast = hears(SocketAddr::from((IpAddr::V4(GROUP), BEACON_PORT))); - let broadcast = hears(SocketAddr::from(( + let directed = interface_broadcasts() + .into_iter() + .any(|address| hears(SocketAddr::from((IpAddr::V4(address), BEACON_PORT)))); + let limited = hears(SocketAddr::from(( IpAddr::V4(Ipv4Addr::BROADCAST), BEACON_PORT, ))); ( multicast, - broadcast, + directed || limited, format!( - "multicast={multicast} broadcast={broadcast} interface={}", + "multicast={multicast} directed={directed} limited={limited} interface={}", local_address() ), ) @@ -1214,6 +1387,51 @@ mod tests { assert!(!state.is_enabled()); } + #[test] + fn directed_broadcasts_follow_the_interface_netmask() { + assert_eq!( + directed_broadcast( + Ipv4Addr::new(192, 168, 2, 34), + Ipv4Addr::new(255, 255, 255, 0) + ), + Some(Ipv4Addr::new(192, 168, 2, 255)) + ); + assert_eq!( + directed_broadcast( + Ipv4Addr::new(10, 20, 30, 40), + Ipv4Addr::new(255, 255, 240, 0) + ), + Some(Ipv4Addr::new(10, 20, 31, 255)) + ); + assert_eq!( + directed_broadcast(Ipv4Addr::new(127, 0, 0, 1), Ipv4Addr::new(255, 0, 0, 0)), + None + ); + assert_eq!( + directed_broadcast(Ipv4Addr::new(169, 254, 1, 2), Ipv4Addr::new(255, 255, 0, 0)), + None + ); + assert_eq!( + directed_broadcast( + Ipv4Addr::new(192, 168, 2, 34), + Ipv4Addr::new(255, 255, 255, 255) + ), + None + ); + } + + #[test] + fn interface_broadcasts_are_unique_and_usable() { + let broadcasts = interface_broadcasts(); + let mut unique = broadcasts.clone(); + unique.sort_unstable(); + unique.dedup(); + assert_eq!(broadcasts, unique); + assert!(broadcasts + .iter() + .all(|address| !address.is_unspecified() && !address.is_loopback())); + } + #[test] fn both_readmes_document_the_real_discovery_address() { let expected = format!("{GROUP}:{BEACON_PORT}"); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 0f4006b..0f8a70d 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Shift", - "version": "0.1.5", + "version": "0.1.6", "identifier": "app.nex.shift", "build": { "beforeDevCommand": "pnpm dev",