修复直传接收并优化文件选择提示
This commit is contained in:
@@ -169,6 +169,11 @@ fn handle_client(
|
||||
sessions: &SessionMap,
|
||||
completed: &CompletedMap,
|
||||
) -> Result<()> {
|
||||
// The listener is non-blocking so the UI can poll for shutdown. On
|
||||
// Windows an accepted socket may retain that mode, which made a body read
|
||||
// race the next Wi-Fi Direct packet and fail with WSAEWOULDBLOCK (10035).
|
||||
// File requests must instead wait under the explicit socket timeouts.
|
||||
stream.set_nonblocking(false)?;
|
||||
stream.set_nodelay(true).ok();
|
||||
stream.set_read_timeout(Some(Duration::from_secs(120)))?;
|
||||
stream.set_write_timeout(Some(Duration::from_secs(120)))?;
|
||||
@@ -572,3 +577,63 @@ fn hex(bytes: &[u8]) -> String {
|
||||
for &b in bytes { out.push(H[(b >> 4) as usize] as char); out.push(H[(b & 15) as usize] as char); }
|
||||
out
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::{
|
||||
io::{Read, Write},
|
||||
net::TcpListener,
|
||||
sync::mpsc,
|
||||
time::{SystemTime, UNIX_EPOCH},
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn legacy_upload_waits_for_a_delayed_body_on_a_nonblocking_accepted_socket() {
|
||||
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
let address = listener.local_addr().unwrap();
|
||||
let dir = std::env::temp_dir().join(format!(
|
||||
"qft-receiver-test-{}-{}",
|
||||
std::process::id(),
|
||||
SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos(),
|
||||
));
|
||||
fs::create_dir_all(&dir).unwrap();
|
||||
let dir_for_server = dir.clone();
|
||||
let (events, _updates) = mpsc::channel();
|
||||
let sessions: SessionMap = Arc::new(Mutex::new(HashMap::new()));
|
||||
let completed: CompletedMap = Arc::new(Mutex::new(HashMap::new()));
|
||||
|
||||
let server = thread::spawn(move || {
|
||||
let (mut stream, _) = listener.accept().unwrap();
|
||||
// This matches the Windows mode inheritance that previously made
|
||||
// the body read return WSAEWOULDBLOCK between TCP packets.
|
||||
stream.set_nonblocking(true).unwrap();
|
||||
handle_client(
|
||||
&mut stream,
|
||||
&dir_for_server,
|
||||
"session",
|
||||
&events,
|
||||
&sessions,
|
||||
&completed,
|
||||
)
|
||||
});
|
||||
|
||||
let mut client = TcpStream::connect(address).unwrap();
|
||||
client
|
||||
.write_all(
|
||||
b"POST /qft/upload HTTP/1.1\r\nHost: localhost\r\nX-QFT-Token: session\r\nContent-Length: 4\r\nX-QFT-Size: 4\r\n\r\n",
|
||||
)
|
||||
.unwrap();
|
||||
client.flush().unwrap();
|
||||
thread::sleep(Duration::from_millis(50));
|
||||
client.write_all(b"qft!").unwrap();
|
||||
client.flush().unwrap();
|
||||
|
||||
let mut response = String::new();
|
||||
client.read_to_string(&mut response).unwrap();
|
||||
server.join().unwrap().unwrap();
|
||||
assert!(response.starts_with("HTTP/1.1 200"), "{response}");
|
||||
assert_eq!(fs::read(dir.join("qft-upload.bin")).unwrap(), b"qft!");
|
||||
let _ = fs::remove_dir_all(dir);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user