fix Windows Direct service reachability

This commit is contained in:
zhy200308
2026-08-12 12:11:15 +08:00
parent 65223dafe4
commit c1a4dbbd7a
11 changed files with 181 additions and 48 deletions
+2 -2
View File
@@ -12,8 +12,8 @@ android {
applicationId = "com.qft.optical" applicationId = "com.qft.optical"
minSdk = 24 minSdk = 24
targetSdk = 35 targetSdk = 35
versionCode = 20 versionCode = 21
versionName = "0.4.8" versionName = "0.4.9"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
@@ -195,7 +195,7 @@ class MainActivity : ComponentActivity() {
) { showReceivedFiles() }) ) { showReceivedFiles() })
root.addView(space(22)) root.addView(space(22))
root.addView(text("本机设备:$receiverDeviceLabel", 13f, MUTED)) root.addView(text("本机设备:$receiverDeviceLabel", 13f, MUTED))
root.addView(text("QFT v${BuildConfig.VERSION_NAME} · Android 7+ 到最新", 12f, MUTED)) root.addView(text("QFT v0.4.9 · Android 7+ 到最新", 12f, MUTED))
setContentView(ScrollView(this).apply { setBackgroundColor(BG); addView(root) }) setContentView(ScrollView(this).apply { setBackgroundColor(BG); addView(root) })
} }
@@ -675,6 +675,7 @@ class MainActivity : ComponentActivity() {
network = network, network = network,
pairing = pair, pairing = pair,
hosts = wifiConnector.discoveryHosts(network), hosts = wifiConnector.discoveryHosts(network),
deviceName = receiverDeviceLabel,
) )
subnet = wifiConnector.subnetEndpoints(network, pair.port) subnet = wifiConnector.subnetEndpoints(network, pair.port)
runOnUiThread { runOnUiThread {
@@ -57,6 +57,10 @@ internal fun <T> awaitFirstNonNull(
return null return null
} }
internal fun directDiscoveryRequest(session: String, deviceName: String): ByteArray =
"QFTDISC2:$session:${Base64Url.encode(deviceName.toByteArray(Charsets.UTF_8))}"
.toByteArray(Charsets.US_ASCII)
object UploadClient { object UploadClient {
private const val TAG = "QftUpload" private const val TAG = "QftUpload"
private const val DISCOVERY_PORT = 39392 private const val DISCOVERY_PORT = 39392
@@ -96,6 +100,7 @@ object UploadClient {
network: Network?, network: Network?,
pairing: PairingPayload, pairing: PairingPayload,
hosts: List<InetAddress>, hosts: List<InetAddress>,
deviceName: String,
): String? { ): String? {
if (hosts.isEmpty()) return null if (hosts.isEmpty()) return null
val socket = DatagramSocket() val socket = DatagramSocket()
@@ -103,7 +108,7 @@ object UploadClient {
network?.bindSocket(socket) network?.bindSocket(socket)
socket.broadcast = true socket.broadcast = true
socket.soTimeout = 160 socket.soTimeout = 160
val request = "QFTDISC2:${pairing.session}".toByteArray(Charsets.US_ASCII) val request = directDiscoveryRequest(pairing.session, deviceName)
// Two directed/broadcast bursts fit within the initial routing // Two directed/broadcast bursts fit within the initial routing
// window while keeping service discovery below 600 ms. // window while keeping service discovery below 600 ms.
repeat(2) { repeat(2) {
@@ -10,6 +10,18 @@ import java.util.concurrent.Executors
import java.util.zip.CRC32 import java.util.zip.CRC32
class ProtocolTest { class ProtocolTest {
@Test
fun directDiscoveryCarriesTheAndroidDeviceName() {
val request = directDiscoveryRequest(
session = "abcdefghijklmnopqrstuvwxyz012345",
deviceName = "HUAWEI CDY-AN90",
).toString(Charsets.US_ASCII)
val encoded = request.substringAfterLast(':')
assertTrue(request.startsWith("QFTDISC2:abcdefghijklmnopqrstuvwxyz012345:"))
assertEquals("HUAWEI CDY-AN90", Base64Url.decode(encoded)?.toString(Charsets.UTF_8))
}
@Test @Test
fun dedicatedWifiNeverProbesQrOrComputerLanAddresses() { fun dedicatedWifiNeverProbesQrOrComputerLanAddresses() {
assertEquals( assertEquals(
+1 -1
View File
@@ -2587,7 +2587,7 @@ checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
[[package]] [[package]]
name = "qft-desktop" name = "qft-desktop"
version = "0.4.12" version = "0.4.13"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "qft-desktop" name = "qft-desktop"
version = "0.4.12" version = "0.4.13"
edition = "2024" edition = "2024"
rust-version = "1.95" rust-version = "1.95"
+18 -9
View File
@@ -6,8 +6,8 @@
//! //!
//! 三条设计约束: //! 三条设计约束:
//! 1. **只在确实缺规则时申请**。每次启动都弹 UAC 是骚扰。 //! 1. **只在确实缺规则时申请**。每次启动都弹 UAC 是骚扰。
//! 2. **被拒绝就记住**。写一个标记文件,之后只在界面上留一个手动按钮, //! 2. **没有放行就不宣称 Direct 已就绪**。用户明确点击“启动直传/接收”时,
//! 不再自动弹窗。 //! 可以走一次标准 UAC;拒绝或复检失败就停止启动,不生成不可用二维码。
//! 3. **规则尽量窄**。只放行本程序这一个可执行文件,绝不整体关闭防火墙。 //! 3. **规则尽量窄**。只放行本程序这一个可执行文件,绝不整体关闭防火墙。
//! 但**不能按网络配置文件收窄**——见下方 `grant()` 里的说明。 //! 但**不能按网络配置文件收窄**——见下方 `grant()` 里的说明。
//! //!
@@ -101,7 +101,6 @@ fn current_exe() -> Result<PathBuf> {
/// 可执行文件的**阻止**规则,名字是程序名而不是我们的 `QFT Desktop`。 /// 可执行文件的**阻止**规则,名字是程序名而不是我们的 `QFT Desktop`。
/// 只按显示名查完全看不到它,却又是它压着我们的放行规则—— /// 只按显示名查完全看不到它,却又是它压着我们的放行规则——
/// 表现就是「点了放行、界面显示已放行,手机依然连不上」。 /// 表现就是「点了放行、界面显示已放行,手机依然连不上」。
#[cfg(target_os = "windows")]
fn probe_script(exe: &str) -> String { fn probe_script(exe: &str) -> String {
format!( format!(
r#" r#"
@@ -110,9 +109,9 @@ $exe = '{exe}'
Get-NetFirewallProfile | ForEach-Object {{ Get-NetFirewallProfile | ForEach-Object {{
"PROFILE|$($_.Name)|$($_.Enabled)|$($_.DefaultInboundAction)|$($_.AllowInboundRules)" "PROFILE|$($_.Name)|$($_.Enabled)|$($_.DefaultInboundAction)|$($_.AllowInboundRules)"
}} }}
$byName = Get-NetFirewallRule -DisplayName '{RULE_NAME}' # 只查询当前 exe 路径。同名旧规则可能属于上一次构建目录;把它算成有效
$byPath = Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule # 会让界面显示绿色,但当前 qft-desktop.exe 的入站仍被全部拦截。
@($byName) + @($byPath) | Where-Object {{ $_ }} | Sort-Object -Property Name -Unique | ForEach-Object {{ Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule | Sort-Object -Property Name -Unique | ForEach-Object {{
"RULE|$($_.Enabled)|$($_.Direction)|$($_.Action)|$($_.Profile)|$($_.DisplayName)" "RULE|$($_.Enabled)|$($_.Direction)|$($_.Action)|$($_.Profile)|$($_.DisplayName)"
}} }}
"#, "#,
@@ -213,7 +212,7 @@ fn grant_script(exe: &str, marker: &str) -> String {
# 重建放行规则。Profile Any 是刻意的:Windows 把没见过的网络\r\n\ # 重建放行规则。Profile Any 是刻意的:Windows 把没见过的网络\r\n\
# (尤其是 Direct AP 虚拟网卡)默认归为公用网络。\r\n\ # (尤其是 Direct AP 虚拟网卡)默认归为公用网络。\r\n\
Remove-NetFirewallRule -DisplayName '{RULE_NAME}' -ErrorAction SilentlyContinue\r\n\ Remove-NetFirewallRule -DisplayName '{RULE_NAME}' -ErrorAction SilentlyContinue\r\n\
New-NetFirewallRule -DisplayName '{RULE_NAME}' -Direction Inbound -Program $exe -Action Allow -Profile Any -Enabled True | Out-Null\r\n\ New-NetFirewallRule -DisplayName '{RULE_NAME}' -Direction Inbound -Program $exe -Action Allow -Profile Any -Enabled True -EdgeTraversalPolicy Allow | Out-Null\r\n\
# 只有真的建成了才写标记,调用方据此判断成败\r\n\ # 只有真的建成了才写标记,调用方据此判断成败\r\n\
Set-Content -Path $marker -Value 'ok' -Encoding ASCII\r\n" Set-Content -Path $marker -Value 'ok' -Encoding ASCII\r\n"
) )
@@ -417,7 +416,7 @@ pub fn manual_instructions(port: u16) -> String {
$exe = \"{exe}\"\n\ $exe = \"{exe}\"\n\
Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule | Where-Object {{ $_.Direction -eq 'Inbound' -and $_.Action -eq 'Block' }} | Remove-NetFirewallRule\n\ Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule | Where-Object {{ $_.Direction -eq 'Inbound' -and $_.Action -eq 'Block' }} | Remove-NetFirewallRule\n\
Remove-NetFirewallRule -DisplayName \"{RULE_NAME}\" -ErrorAction SilentlyContinue\n\ Remove-NetFirewallRule -DisplayName \"{RULE_NAME}\" -ErrorAction SilentlyContinue\n\
New-NetFirewallRule -DisplayName \"{RULE_NAME}\" -Direction Inbound -Program $exe -Action Allow -Profile Any -Enabled True\n\ New-NetFirewallRule -DisplayName \"{RULE_NAME}\" -Direction Inbound -Program $exe -Action Allow -Profile Any -Enabled True -EdgeTraversalPolicy Allow\n\
Get-NetFirewallProfile | Select-Object Name,Enabled,AllowInboundRules\n\ Get-NetFirewallProfile | Select-Object Name,Enabled,AllowInboundRules\n\
Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule | Select-Object DisplayName,Enabled,Direction,Action,Profile\n" Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule | Select-Object DisplayName,Enabled,Direction,Action,Profile\n"
) )
@@ -657,15 +656,25 @@ mod tests {
// 必须写成功标记,否则调用方无法区分「跑通了」和「脚本报错了」 // 必须写成功标记,否则调用方无法区分「跑通了」和「脚本报错了」
assert!(script.contains("Set-Content -Path $marker")); assert!(script.contains("Set-Content -Path $marker"));
assert!(script.contains("-Profile Any")); assert!(script.contains("-Profile Any"));
assert!(script.contains("-EdgeTraversalPolicy Allow"));
// 单引号要按 PowerShell 的规则翻倍转义 // 单引号要按 PowerShell 的规则翻倍转义
let tricky = grant_script("C:\\o'brien\\qft.exe", "C:\\t.ok"); let tricky = grant_script("C:\\o'brien\\qft.exe", "C:\\t.ok");
assert!(tricky.contains("'C:\\o''brien\\qft.exe'"), "{tricky}"); assert!(tricky.contains("'C:\\o''brien\\qft.exe'"), "{tricky}");
} }
#[test]
fn probe_never_counts_a_same_named_rule_for_an_old_executable() {
let script = probe_script(r"C:\new-build\qft-desktop.exe");
assert!(script.contains("Get-NetFirewallApplicationFilter -Program $exe"));
assert!(
!script.contains("Get-NetFirewallRule -DisplayName"),
"只按同名规则查询会把旧构建路径误判为已放行:{script}"
);
}
#[test] #[test]
fn status_is_read_only_and_repeatable() { fn status_is_read_only_and_repeatable() {
// 检测必须无副作用:连续调用结果一致,且不改动任何系统设置 // 检测必须无副作用:连续调用结果一致,且不改动任何系统设置
assert_eq!(status(), status()); assert_eq!(status(), status());
} }
} }
+87 -24
View File
@@ -1068,25 +1068,26 @@ impl QftApp {
} }
fn start_receiver(&mut self, ctx: &egui::Context) { fn start_receiver(&mut self, ctx: &egui::Context) {
// Direct AP 会新建一块虚拟网卡,其网络类型往往与主网卡不同,
// 因此每次启动接收都重新检测一次,而不是沿用上次结果。
self.refresh_firewall();
let Some(save_dir) = self.receive.save_dir.clone() else { return }; let Some(save_dir) = self.receive.save_dir.clone() else { return };
self.stop_receiver(); self.stop_receiver();
if self.receive.use_direct_ap {
self.receive.status = "正在核验当前 qft-desktop.exe 的防火墙规则…".into();
if let Err(message) = self.ensure_direct_firewall_ready() {
self.receive.status = message;
return;
}
} else {
self.refresh_firewall();
}
self.receive.status = "正在初始化接收服务…".into(); self.receive.status = "正在初始化接收服务…".into();
let token = pairing::new_session_token(); let token = pairing::new_session_token();
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::channel();
let server = match ReceiverServer::start(save_dir, token.clone(), tx) {
Ok(v) => v,
Err(e) => { self.receive.status = format!("接收服务启动失败:{e:#}"); return; }
};
let mut direct_ap = None; let mut direct_ap = None;
let wifi = if self.receive.use_direct_ap { let wifi = if self.receive.use_direct_ap {
let (ssid, passphrase) = match pairing::load_or_create_direct_ap_credentials(&self.local_device) { let (ssid, passphrase) = match pairing::load_or_create_direct_ap_credentials(&self.local_device) {
Ok(v) => v, Ok(v) => v,
Err(e) => { Err(e) => {
drop(server);
self.receive.status = format!("读取 QFT Direct 配网身份失败:{e:#}"); self.receive.status = format!("读取 QFT Direct 配网身份失败:{e:#}");
return; return;
} }
@@ -1097,15 +1098,24 @@ impl QftApp {
Some(WifiCredentials { ssid, passphrase, security: "WPA2".into() }) Some(WifiCredentials { ssid, passphrase, security: "WPA2".into() })
} }
Err(e) => { Err(e) => {
drop(server);
self.receive.status = format!("QFT Direct 启动失败:{e:#}\n可切换到“当前局域网”备用模式。 "); self.receive.status = format!("QFT Direct 启动失败:{e:#}\n可切换到“当前局域网”备用模式。 ");
return; return;
} }
} }
} else { None }; } else { None };
// Give the virtual adapter a moment to appear before enumerating addresses. // 先创建专用网络,再绑定 0.0.0.0。虽然 Windows 理论上会把既有的
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(250)); } // INADDR_ANY socket 应用于后出现的网卡,但实机上 WFP/新网络配置文件
// 初始化存在竞态;服务后绑定可消除这一不必要的不确定性。
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(500)); }
let server = match ReceiverServer::start(save_dir, token.clone(), tx) {
Ok(v) => v,
Err(e) => {
drop(direct_ap);
self.receive.status = format!("接收服务启动失败:{e:#}");
return;
}
};
let payload = PairingPayload { let payload = PairingPayload {
v: 2, v: 2,
session: token.clone(), session: token.clone(),
@@ -1153,26 +1163,28 @@ impl QftApp {
} }
fn start_sender(&mut self, ctx: &egui::Context) { fn start_sender(&mut self, ctx: &egui::Context) {
// Direct AP 的虚拟网卡类型与主网卡往往不同,每次启动都重新检测
self.refresh_firewall();
let Some(file) = self.send.file.clone() else { return }; let Some(file) = self.send.file.clone() else { return };
let Some(sha256) = self.send.sha256.clone() else { return }; let Some(sha256) = self.send.sha256.clone() else { return };
let file_name = file.file_name().and_then(|v| v.to_str()).unwrap_or("qft-download.bin").to_owned(); let file_name = file.file_name().and_then(|v| v.to_str()).unwrap_or("qft-download.bin").to_owned();
self.stop_sender(); self.stop_sender();
if self.send.use_direct_ap {
self.send.status = "正在核验当前 qft-desktop.exe 的防火墙规则…".into();
if let Err(message) = self.ensure_direct_firewall_ready() {
self.send.status = message;
return;
}
} else {
self.refresh_firewall();
}
self.send.status = "正在初始化电脑发送服务…".into(); self.send.status = "正在初始化电脑发送服务…".into();
let token = pairing::new_session_token(); let token = pairing::new_session_token();
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::channel();
let server = match SenderServer::start(file, token.clone(), tx) {
Ok(v) => v,
Err(e) => { self.send.status = format!("发送服务启动失败:{e:#}"); return; }
};
let mut direct_ap = None; let mut direct_ap = None;
let wifi = if self.send.use_direct_ap { let wifi = if self.send.use_direct_ap {
let (ssid, passphrase) = match pairing::load_or_create_direct_ap_credentials(&self.local_device) { let (ssid, passphrase) = match pairing::load_or_create_direct_ap_credentials(&self.local_device) {
Ok(v) => v, Ok(v) => v,
Err(e) => { Err(e) => {
drop(server);
self.send.status = format!("读取 QFT Direct 配网身份失败:{e:#}"); self.send.status = format!("读取 QFT Direct 配网身份失败:{e:#}");
return; return;
} }
@@ -1183,14 +1195,21 @@ impl QftApp {
Some(WifiCredentials { ssid, passphrase, security: "WPA2".into() }) Some(WifiCredentials { ssid, passphrase, security: "WPA2".into() })
} }
Err(e) => { Err(e) => {
drop(server);
self.send.status = format!("QFT Direct 启动失败:{e:#}\n可切换到“当前局域网”备用模式。"); self.send.status = format!("QFT Direct 启动失败:{e:#}\n可切换到“当前局域网”备用模式。");
return; return;
} }
} }
} else { None }; } else { None };
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(250)); } if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(500)); }
let server = match SenderServer::start(file, token.clone(), tx) {
Ok(v) => v,
Err(e) => {
drop(direct_ap);
self.send.status = format!("发送服务启动失败:{e:#}");
return;
}
};
let payload = PairingPayload { let payload = PairingPayload {
v: 2, v: 2,
session: token.clone(), session: token.clone(),
@@ -1247,6 +1266,10 @@ impl QftApp {
} }
for event in pending { for event in pending {
match event { match event {
SenderEvent::TransportConnected { peer } => {
self.send.connected_device = format!("Android({peer},正在认证)");
self.send.status = "Android 已到达桌面 TCP 服务,正在校验二维码会话。".into();
}
SenderEvent::ClientConnected { device } => { SenderEvent::ClientConnected { device } => {
self.send.connected_device = device; self.send.connected_device = device;
self.send.status = "Android 已确认本次二维码会话,正在准备下载。".into(); self.send.status = "Android 已确认本次二维码会话,正在准备下载。".into();
@@ -1587,9 +1610,8 @@ impl QftApp {
/// 只做**只读检测**,不申请任何权限。 /// 只做**只读检测**,不申请任何权限。
/// ///
/// 早先版本会在启动接收时自动弹 UAC。实际用下来这太侵入: /// 普通页面刷新只读;用户明确启动 QFT Direct 时由
/// 多数人只是想收个文件,却先被要求管理员授权。 /// `ensure_direct_firewall_ready` 负责必要的授权与复检。
/// 现在提权一律由用户点按钮触发(`request_firewall_grant`)。
fn refresh_firewall(&mut self) { fn refresh_firewall(&mut self) {
if self.pc.firewall_probing { if self.pc.firewall_probing {
return; return;
@@ -1602,7 +1624,44 @@ impl QftApp {
}); });
} }
/// 用户显式点击后才提权。 /// Direct 模式不再允许在“防火墙大概没问题”的状态下生成二维码。
///
/// Windows 的应用规则绑定 exe 的完整路径;旧构建目录留下的同名规则
/// 对当前二进制没有任何作用。这里同步核验当前路径,缺规则时走标准 UAC
/// 创建后再复检。只有复检明确为 Allowed 才继续创建 AP 与监听服务。
fn ensure_direct_firewall_ready(&mut self) -> Result<(), String> {
self.pc.firewall_probe = None;
self.pc.firewall_probing = false;
let mut status = firewall::status();
if matches!(status, firewall::FirewallStatus::Allowed) {
self.pc.firewall = status;
self.pc.firewall_note = "当前程序路径已确认放行".into();
return Ok(());
}
if status.fixable_by_grant() {
self.pc.firewall = status;
self.pc.firewall_note = "需要管理员确认后才能启动 QFT Direct".into();
firewall::grant().map_err(|e| format!(
"QFT Direct 未启动:当前 qft-desktop.exe 尚未真正放行。\n{e:#}\n请点击“放行防火墙”后重试。"
))?;
status = firewall::status();
}
self.pc.firewall = status.clone();
if matches!(status, firewall::FirewallStatus::Allowed) {
self.pc.firewall_note = "当前程序路径已确认放行".into();
Ok(())
} else {
self.pc.firewall_note = status.detail();
Err(format!(
"QFT Direct 未启动:无法确认当前 qft-desktop.exe 可接收入站连接。\n{}\n请先处理防火墙提示再重试。",
status.detail()
))
}
}
/// 用户点击防火墙面板按钮时的手动授权入口。
fn request_firewall_grant(&mut self) { fn request_firewall_grant(&mut self) {
match firewall::grant() { match firewall::grant() {
Ok(()) => { Ok(()) => {
@@ -1784,6 +1843,10 @@ impl QftApp {
} }
for event in pending { for event in pending {
match event { match event {
ReceiverEvent::TransportConnected { peer } => {
self.receive.connected_device = format!("Android({peer},正在认证)");
self.receive.status = "Android 已到达桌面 TCP 服务,正在校验二维码会话。".into();
}
ReceiverEvent::ClientConnected { device } => { ReceiverEvent::ClientConnected { device } => {
self.receive.connected_device = device; self.receive.connected_device = device;
self.receive.status = "Android 已连接到电脑。可以开始发送文件。".into(); self.receive.status = "Android 已连接到电脑。可以开始发送文件。".into();
+30
View File
@@ -94,6 +94,24 @@ pub fn new_session_token() -> String {
URL_SAFE_NO_PAD.encode(bytes) URL_SAFE_NO_PAD.encode(bytes)
} }
/// Decode an authenticated Direct discovery datagram. `Some(None)` preserves
/// compatibility with older Android builds that did not include a device name.
pub fn discovery_device(text: &str, session: &str) -> Option<Option<String>> {
let prefix = format!("QFTDISC2:{session}");
if text == prefix {
return Some(None);
}
let encoded = text.strip_prefix(&(prefix + ":"))?;
let bytes = URL_SAFE_NO_PAD.decode(encoded).ok()?;
let name = String::from_utf8(bytes).ok()?;
let clean: String = name
.chars()
.filter(|c| !c.is_control())
.take(80)
.collect();
(!clean.trim().is_empty()).then_some(Some(clean))
}
/// Keep one random AP identity per Windows device so Android can remember the /// Keep one random AP identity per Windows device so Android can remember the
/// user's approval for that exact local-only network. The AP itself is only /// user's approval for that exact local-only network. The AP itself is only
/// active while QFT receive mode is running; the file-transfer session token is /// active while QFT receive mode is running; the file-transfer session token is
@@ -237,6 +255,18 @@ pub fn local_ipv4_endpoints(port: u16) -> Vec<String> {
mod tests { mod tests {
use super::*; use super::*;
#[test]
fn discovery_request_reports_android_name_and_accepts_legacy_format() {
let session = "abcdefghijklmnopqrstuvwxyz012345";
let name = URL_SAFE_NO_PAD.encode("HUAWEI CDY-AN90".as_bytes());
assert_eq!(
discovery_device(&format!("QFTDISC2:{session}:{name}"), session),
Some(Some("HUAWEI CDY-AN90".into()))
);
assert_eq!(discovery_device(&format!("QFTDISC2:{session}"), session), Some(None));
assert_eq!(discovery_device("QFTDISC2:wrong", session), None);
}
#[test] #[test]
fn download_pairing_uses_dedicated_short_prefix() { fn download_pairing_uses_dedicated_short_prefix() {
let payload = PairingPayload { let payload = PairingPayload {
+11 -5
View File
@@ -27,6 +27,7 @@ const IO_BUFFER: usize = 1024 * 1024;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum ReceiverEvent { pub enum ReceiverEvent {
TransportConnected { peer: String },
ClientConnected { device: String }, ClientConnected { device: String },
UploadStarted { device: String, file_name: String, size: u64 }, UploadStarted { device: String, file_name: String, size: u64 },
UploadProgress { device: String, file_name: String, received: u64, size: u64 }, UploadProgress { device: String, file_name: String, received: u64, size: u64 },
@@ -96,7 +97,8 @@ impl ReceiverServer {
let tcp_thread = thread::spawn(move || { let tcp_thread = thread::spawn(move || {
while !stop_tcp.load(Ordering::Relaxed) { while !stop_tcp.load(Ordering::Relaxed) {
match listener.accept() { match listener.accept() {
Ok((mut stream, _)) => { Ok((mut stream, peer)) => {
let _ = events_tcp.send(ReceiverEvent::TransportConnected { peer: peer.to_string() });
let dir = dir_tcp.clone(); let dir = dir_tcp.clone();
let token = token_tcp.clone(); let token = token_tcp.clone();
let tx = events_tcp.clone(); let tx = events_tcp.clone();
@@ -139,7 +141,6 @@ impl ReceiverServer {
} }
}; };
let _ = socket.set_read_timeout(Some(Duration::from_millis(250))); let _ = socket.set_read_timeout(Some(Duration::from_millis(250)));
let expected = format!("QFTDISC2:{token_udp}");
let response = format!("QFTHERE2:{token_udp}:{port}"); let response = format!("QFTHERE2:{token_udp}:{port}");
// PC↔PC 的对端不知道令牌,需要先能把本机列出来 // PC↔PC 的对端不知道令牌,需要先能把本机列出来
let announce = crate::discovery::browse_reply(&crate::discovery::NodeAnnounce { let announce = crate::discovery::browse_reply(&crate::discovery::NodeAnnounce {
@@ -153,12 +154,17 @@ impl ReceiverServer {
match socket.recv_from(&mut buf) { match socket.recv_from(&mut buf) {
Ok((n, peer)) => { Ok((n, peer)) => {
match std::str::from_utf8(&buf[..n]).ok() { match std::str::from_utf8(&buf[..n]).ok() {
Some(text) if text == expected => {
let _ = socket.send_to(response.as_bytes(), peer);
}
Some(text) if text == crate::discovery::BROWSE_QUERY => { Some(text) if text == crate::discovery::BROWSE_QUERY => {
let _ = socket.send_to(&announce, peer); let _ = socket.send_to(&announce, peer);
} }
Some(text) => {
if let Some(device) = crate::pairing::discovery_device(text, &token_udp) {
if let Some(device) = device {
let _ = events.send(ReceiverEvent::ClientConnected { device });
}
let _ = socket.send_to(response.as_bytes(), peer);
}
}
_ => {} _ => {}
} }
} }
+11 -4
View File
@@ -22,6 +22,7 @@ const IO_BUFFER: usize = 1024 * 1024;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum SenderEvent { pub enum SenderEvent {
TransportConnected { peer: String },
ClientConnected { device: String }, ClientConnected { device: String },
DownloadStarted { device: String, file_name: String, size: u64 }, DownloadStarted { device: String, file_name: String, size: u64 },
DownloadCompleted { device: String, file_name: String }, DownloadCompleted { device: String, file_name: String },
@@ -61,7 +62,8 @@ impl SenderServer {
let tcp_thread = thread::spawn(move || { let tcp_thread = thread::spawn(move || {
while !tcp_stop.load(Ordering::Relaxed) { while !tcp_stop.load(Ordering::Relaxed) {
match listener.accept() { match listener.accept() {
Ok((mut stream, _)) => { Ok((mut stream, peer)) => {
let _ = tcp_events.send(SenderEvent::TransportConnected { peer: peer.to_string() });
let token = tcp_token.clone(); let token = tcp_token.clone();
let path = file_path.clone(); let path = file_path.clone();
let name = file_name.clone(); let name = file_name.clone();
@@ -93,15 +95,20 @@ impl SenderServer {
} }
}; };
let _ = socket.set_read_timeout(Some(Duration::from_millis(250))); let _ = socket.set_read_timeout(Some(Duration::from_millis(250)));
let expected = format!("QFTDISC2:{session_token}");
let response = format!("QFTHERE2:{session_token}:{port}"); let response = format!("QFTHERE2:{session_token}:{port}");
let mut buf = [0u8; 512]; let mut buf = [0u8; 512];
while !udp_stop.load(Ordering::Relaxed) { while !udp_stop.load(Ordering::Relaxed) {
match socket.recv_from(&mut buf) { match socket.recv_from(&mut buf) {
Ok((n, peer)) if std::str::from_utf8(&buf[..n]).ok() == Some(expected.as_str()) => { Ok((n, peer)) => {
let Some(device) = std::str::from_utf8(&buf[..n])
.ok()
.and_then(|text| crate::pairing::discovery_device(text, &session_token))
else { continue };
if let Some(device) = device {
let _ = events.send(SenderEvent::ClientConnected { device });
}
let _ = socket.send_to(response.as_bytes(), peer); let _ = socket.send_to(response.as_bytes(), peer);
} }
Ok(_) => {}
Err(e) if matches!(e.kind(), std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut) => {} Err(e) if matches!(e.kind(), std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut) => {}
Err(_) => break, Err(_) => break,
} }