feat(lib): let another thread cancel a client's connect and login
A caller that gives up on a login had no way to reach the client: the thread that owns it sits in login() for up to 45 seconds, and disconnect() needs the client to itself. Until that thread returned, the abandoned client kept connecting and still wrote its login frame the moment the server finished the TCP handshake. When that happened after a replacement had logged in under the same name, the server kicked the replacement. Client::cancel_handle() hands out a CancelHandle that can be moved to any thread. After cancel(): - the server actor writes nothing more. The check and the write share a lock with cancel(), so once cancel() returns no frame leaves, whether it was waiting in the queue, in the dispatcher channel, or mid-flush; - login() returns NotConnected within 100 ms, and hands no login to the actor at all when the client was already cancelled; - connect() refuses before binding the listener when the client was already cancelled. A cancel that lands during that check can still let the bind through. Either way the owner drops the client as before, which disconnects it and gives its port back. A frame already written before cancel() returned cannot be recalled. The API is additive, and login() on a client nobody cancels behaves as before. Soulseek.NET tears the whole connection down when ConnectAsync is cancelled, and Nicotine+ drops outgoing messages for a socket it closed; this gives soulseek-rs the same end state from another thread.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use crate::actor::{Actor, ActorHandle, ConnectionState};
|
||||
use crate::client::ClientOperation;
|
||||
use crate::client::{CancelHandle, ClientOperation};
|
||||
use crate::dispatcher::MessageDispatcher;
|
||||
use crate::message::server::AdminMessageHandler;
|
||||
use crate::message::server::CantConnectToPeerHandler;
|
||||
@@ -288,6 +288,7 @@ pub struct ServerActor {
|
||||
shared_folder_count: u32,
|
||||
shared_file_count: u32,
|
||||
session: SessionWatch,
|
||||
cancel: CancelHandle,
|
||||
}
|
||||
|
||||
/// The messages a client sends right after a successful login: its shared-file
|
||||
@@ -340,6 +341,7 @@ impl ServerActor {
|
||||
shared_folder_count,
|
||||
shared_file_count,
|
||||
session: SessionWatch::default(),
|
||||
cancel: CancelHandle::new(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -348,6 +350,10 @@ impl ServerActor {
|
||||
self.session = session;
|
||||
}
|
||||
|
||||
pub fn set_cancel(&mut self, cancel: CancelHandle) {
|
||||
self.cancel = cancel;
|
||||
}
|
||||
|
||||
fn initiate_connection(&mut self) -> bool {
|
||||
let stream = (self.address.get_host(), self.address.get_port())
|
||||
.to_socket_addrs()
|
||||
@@ -563,6 +569,10 @@ impl ServerActor {
|
||||
}
|
||||
|
||||
fn send_message(&mut self, message: Message) {
|
||||
let cancel = self.cancel.clone();
|
||||
let Some(_live) = cancel.live() else {
|
||||
return;
|
||||
};
|
||||
let Some(stream) = self.stream.as_mut() else {
|
||||
error!("[server] Cannot send message: stream is None");
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user