fix!: make concurrent invocations work instead of silently seeing nothing (#22)
Running several one-shot commands at once returned "no results" for queries that had plenty. Four defects, each of which made a dead session look like an empty network: - The peer listener bound its port inside a detached thread and panicked on EADDRINUSE, unwinding that thread alone. The process carried on with no listener, so no peer could deliver a search response. `Listen::bind` now takes the socket before login and falls back to an ephemeral port when the configured one is held. - SetWaitPort advertised the configured port whether or not it was bound, so peers dialled a sibling process that discarded responses to tickets it never issued. The port the listener really holds is what gets advertised, mapped through UPnP, and reported by `whoami` and `serve`. - A zero-byte read is EOF on a TCP socket, but MessageReader reported it as success, so a server that closed cleanly left the actor polling a dead socket. It is now an error, and Relogged (code 41) has a handler. The peer actor classifies that error: a control connection that was established and then closed is a clean disconnect, because peers drop idle sockets while the bytes move over their own connection, and reporting an error there fails every download queued with that peer including the one streaming. A connection that never established keeps the error path, which is what the server-brokered fallback reads to know a peer is unreachable. - A session the server cut off - usually because another process logged in under the same name - exited 4, documented as "it worked and found nothing". Callers concluded the file was unavailable. Sessions now record why they ended and those verdicts become exit 7. The server allows one session per account, so concurrency still needs a distinct --username per run; SKILL.md documents that. The listener port needs no such care any more. Six e2e tests against soulfind cover it, each of which fails without the fix: a taken listen port, a displaced session, three clients searching at once under one configured port, the two CLI equivalents, and a peer that hangs up its control connection while a transfer is still to come. BREAKING CHANGE: `Listen::start` is replaced by `Listen::bind` and `Listen::serve`, so the caller owns the socket and can read the port it actually bound. `Client::listen_port` and `Client::session_loss` are new.
This commit is contained in:
@@ -36,20 +36,11 @@ fn read_peer_init_message(
|
||||
reader: &mut MessageReader,
|
||||
) -> io::Result<Message> {
|
||||
// An untrusted peer gets a bounded handshake. Without this a peer that
|
||||
// connects and stays silent parks this read forever, and one that hangs up
|
||||
// spins it (a zero-byte read is EOF, which `read_from_socket` reports as
|
||||
// success) — either way pinning a thread that owes us a peer init.
|
||||
// connects and stays silent parks this read forever, pinning a thread that
|
||||
// owes us a peer init.
|
||||
stream.set_read_timeout(Some(PEER_INIT_TIMEOUT))?;
|
||||
let message = loop {
|
||||
let buffered = reader.buffer_len();
|
||||
reader.read_from_socket(stream)?;
|
||||
if reader.buffer_len() == buffered {
|
||||
return Err(io::Error::new(
|
||||
io::ErrorKind::UnexpectedEof,
|
||||
"peer closed before sending a peer init",
|
||||
));
|
||||
}
|
||||
|
||||
if let Ok(Some(msg)) = reader.extract_message() {
|
||||
break msg;
|
||||
}
|
||||
@@ -374,16 +365,34 @@ fn handle_incoming_connection(stream: TcpStream, context: ConnectionContext) {
|
||||
pub struct Listen {}
|
||||
|
||||
impl Listen {
|
||||
pub fn start(
|
||||
port: u16,
|
||||
/// Take the peer-listening socket, falling back to a port the operating
|
||||
/// system picks when the configured one is already held.
|
||||
///
|
||||
/// Several clients on one machine share one configured port, and losing
|
||||
/// the race for it must not cost a session its listener: an unreachable
|
||||
/// client is one that never receives search responses or transfers. The
|
||||
/// caller advertises [`TcpListener::local_addr`], so peers are always told
|
||||
/// the port that was really bound.
|
||||
pub fn bind(port: u16) -> io::Result<TcpListener> {
|
||||
match TcpListener::bind(("0.0.0.0", port)) {
|
||||
Err(e) if e.kind() == io::ErrorKind::AddrInUse && port != 0 => {
|
||||
info!(
|
||||
"[listener] port {port} is taken, falling back to an \
|
||||
ephemeral port"
|
||||
);
|
||||
TcpListener::bind(("0.0.0.0", 0))
|
||||
}
|
||||
other => other,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn serve(
|
||||
listener: &TcpListener,
|
||||
client_sender: Sender<ClientOperation>,
|
||||
client_context: Arc<RwLock<ClientContext>>,
|
||||
own_username: String,
|
||||
) {
|
||||
info!("[listener] starting listener on port {port}");
|
||||
|
||||
let listener = TcpListener::bind(format!("0.0.0.0:{port}"))
|
||||
.expect("Failed to bind listener to port");
|
||||
info!("[listener] listening on {:?}", listener.local_addr());
|
||||
|
||||
let context = ConnectionContext {
|
||||
client_sender,
|
||||
|
||||
Reference in New Issue
Block a user