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

node: Fixes to wire protocol logic 

* Make sure we cleanup pending peer states when disconnecting before
  handshake.
* Make sure we don't panic if a peer disconnects before being fully
  connected.
This commit is contained in:
cloudhead 2024-01-25 15:33:53 +01:00
parent 49584f4e73
commit aa9c6542ab
No known key found for this signature in database
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,16 +331,18 @@ where
fn disconnect(&mut self, id: ResourceId, reason: DisconnectReason) { fn disconnect(&mut self, id: ResourceId, reason: DisconnectReason) {
match self.peers.get_mut(&id) { match self.peers.get_mut(&id) {
Some(Peer::Disconnecting { .. }) => { Some(Peer::Disconnecting { .. }) => {
log::error!(target: "wire", "Peer (id={id}) is already disconnecting"); log::error!(target: "wire", "Peer with id={id} is already disconnecting");
} }
Some(peer) => { Some(peer) => {
log::debug!(target: "wire", "Disconnecting peer (id={id}): {reason}"); log::debug!(target: "wire", "Disconnecting peer with id={id}: {reason}");
peer.disconnecting(reason); peer.disconnecting(reason);
self.actions.push_back(Action::UnregisterTransport(id)); self.actions.push_back(Action::UnregisterTransport(id));
} }
None => { None => {
log::error!(target: "wire", "Unknown peer (id={id}) cannot be disconnected"); // Connecting peer with no session.
log::debug!(target: "wire", "Disconnecting pending peer with id={id}: {reason}");
self.actions.push_back(Action::UnregisterTransport(id));
} }
} }
} }
@ -413,6 +415,16 @@ where
.push_back(reactor::Action::Send(fd, frame.to_bytes())); .push_back(reactor::Action::Send(fd, frame.to_bytes()));
} }
} }
fn cleanup(&mut self, id: ResourceId, fd: RawFd) {
if self.inbound.remove(&fd).is_some() {
log::debug!(target: "wire", "Cleaning up inbound peer state with id={id} (fd={fd})");
} else if self.outbound.remove(&fd).is_some() {
log::debug!(target: "wire", "Cleaning up outbound peer state with id={id} (fd={fd})");
} else {
log::warn!(target: "wire", "Tried to cleanup unknown peer with id={id} (fd={fd})");
}
}
} }
impl<D, S, G> reactor::Handler for Wire<D, S, G> impl<D, S, G> reactor::Handler for Wire<D, S, G>
@ -488,7 +500,7 @@ where
log::debug!(target: "wire", "Inbound peer resource registered with id={id} (fd={fd})"); log::debug!(target: "wire", "Inbound peer resource registered with id={id} (fd={fd})");
inbound.id = Some(id); inbound.id = Some(id);
} else { } else {
log::error!(target: "wire", "Unknown peer registered with fd={fd} and id={id}"); log::warn!(target: "wire", "Unknown peer registered with fd={fd} and id={id}");
} }
} }
@ -661,8 +673,9 @@ 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", "Received error: listener {} disconnected", id); log::error!(target: "wire", "Received error: listener {} disconnected", id);
} }
reactor::Error::TransportDisconnect(fd, session) => { reactor::Error::TransportDisconnect(id, session) => {
log::error!(target: "wire", "Received error: peer (fd={fd}) disconnected"); let fd = session.as_raw_fd();
log::error!(target: "wire", "Received error: peer id={id} (fd={fd}) disconnected");
// We're dropping the TCP connection here. // We're dropping the TCP connection here.
drop(session); drop(session);
@ -670,7 +683,7 @@ where
// The peer transport is already disconnected and removed from the reactor; // The peer transport is already disconnected and removed from the reactor;
// therefore there is no need to initiate a disconnection. We simply remove // therefore there is no need to initiate a disconnection. We simply remove
// the peer from the map. // the peer from the map.
match self.peers.remove(&fd) { match self.peers.remove(&id) {
Some(mut peer) => { Some(mut peer) => {
let reason = DisconnectReason::Connection(Arc::new(io::Error::from( let reason = DisconnectReason::Connection(Arc::new(io::Error::from(
io::ErrorKind::ConnectionReset, io::ErrorKind::ConnectionReset,
@ -686,16 +699,14 @@ where
log::debug!(target: "wire", "Inbound disconnection before handshake; ignoring..") log::debug!(target: "wire", "Inbound disconnection before handshake; ignoring..")
} }
} }
None => { None => self.cleanup(id, fd),
log::warn!(target: "wire", "Peer with fd {fd} is unknown");
}
} }
} }
} }
} }
fn handover_listener(&mut self, _id: ResourceId, _listener: Self::Listener) { fn handover_listener(&mut self, id: ResourceId, _listener: Self::Listener) {
panic!("Wire::handover_listener: listener handover is not supported"); log::error!(target: "wire", "Listener handover is not supported (id={id})");
} }
fn handover_transport(&mut self, id: ResourceId, transport: Self::Transport) { fn handover_transport(&mut self, id: ResourceId, transport: Self::Transport) {
@ -721,9 +732,7 @@ where
} }
} }
} }
Entry::Vacant(_) => { Entry::Vacant(_) => self.cleanup(id, fd),
panic!("Wire::handover_transport: Unknown peer with id={id} (fd={fd}) handed over");
}
} }
} }
} }