mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Correctly handle disconnect in wire protocol

This commit is contained in:
Alexis Sellier 2023-03-06 12:53:31 +01:00
parent 54dc34d4b9
commit a5ee494fda
No known key found for this signature in database
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
radicle-node/src/wire/protocol.rs
View File

@ -568,21 +568,37 @@ where
// TODO: This should be a fatal error, there's nothing we can do here. // TODO: This should be a fatal error, there's nothing we can do here.
log::error!(target: "wire", "Can't poll connections: {}", err); log::error!(target: "wire", "Can't poll connections: {}", err);
} }
reactor::Error::ListenerPollError(id, err) => { reactor::Error::ListenerPollError(id, _) => {
// TODO: This should be a fatal error, there's nothing we can do here. // TODO: This should be a fatal error, there's nothing we can do here.
log::error!(target: "wire", "Received error: listener {} disconnected: {}", id, err); log::error!(target: "wire", "Received error: listener {} disconnected", id);
self.actions.push_back(Action::UnregisterListener(*id)); self.actions.push_back(Action::UnregisterListener(*id));
} }
reactor::Error::ListenerDisconnect(id, _, err) => { reactor::Error::ListenerDisconnect(id, _, _) => {
// TODO: This should be a fatal error, there's nothing we can do here. // TODO: This should be a fatal error, there's nothing we can do here.
log::error!(target: "wire", "Received error: listener {} disconnected: {}", id, err); log::error!(target: "wire", "Received error: listener {} disconnected", id);
} }
reactor::Error::TransportPollError(fd, err) => { reactor::Error::TransportPollError(fd, _) => {
log::error!(target: "wire", "Received error: peer (fd={fd}) disconnected: {err}"); log::error!(target: "wire", "Received error: peer (fd={fd}) poll error");
self.actions.push_back(Action::UnregisterTransport(*fd)); self.actions.push_back(Action::UnregisterTransport(*fd));
} }
reactor::Error::TransportDisconnect(fd, _, err) => { reactor::Error::TransportDisconnect(fd, _, _) => {
log::error!(target: "wire", "Received error: peer (fd={fd}) disconnected: {err}"); log::error!(target: "wire", "Received error: peer (fd={fd}) disconnected");
match self.peers.get_mut(fd) {
Some(peer) => {
let reason = DisconnectReason::Connection(Arc::new(io::Error::from(
io::ErrorKind::ConnectionReset,
)));
if let Some(id) = peer.id() {
self.service.disconnected(*id, &reason);
}
peer.disconnected(reason);
}
None => {
log::warn!(target: "wire", "Peer with fd {fd} is unknown");
}
}
} }
reactor::Error::WriteFailure(id, err) => { reactor::Error::WriteFailure(id, err) => {
// TODO: Disconnect peer? // TODO: Disconnect peer?