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

node: Drop self-connections 

Also try to avoid initiating a self-connection even if the NID of our
node has changed.
This commit is contained in:
cloudhead 2024-02-07 14:23:52 +01:00
parent 1130608331
commit d901b911c6
No known key found for this signature in database
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
radicle-node/src/service.rs
View File

@ -2050,6 +2050,7 @@ where
.filter(|entry| !entry.address.banned) .filter(|entry| !entry.address.banned)
.filter(|entry| !entry.penalty.is_threshold_reached()) .filter(|entry| !entry.penalty.is_threshold_reached())
.filter(|entry| !self.sessions.contains_key(&entry.node)) .filter(|entry| !self.sessions.contains_key(&entry.node))
.filter(|entry| !self.config.external_addresses.contains(&entry.address.addr))
.filter(|entry| &entry.node != self.nid()) .filter(|entry| &entry.node != self.nid())
.fold(HashMap::new(), |mut acc, entry| { .fold(HashMap::new(), |mut acc, entry| {
acc.entry(entry.node) acc.entry(entry.node)

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

@ -516,7 +516,18 @@ where
SessionEvent::Established(fd, ProtocolArtifact { state, .. }) => { SessionEvent::Established(fd, ProtocolArtifact { state, .. }) => {
// SAFETY: With the NoiseXK protocol, there is always a remote static key. // SAFETY: With the NoiseXK protocol, there is always a remote static key.
let nid: NodeId = state.remote_static_key.unwrap(); let nid: NodeId = state.remote_static_key.unwrap();
// Make sure we don't try to connect to ourselves by mistake.
if &nid == self.signer.public_key() {
log::error!(target: "wire", "Self-connection detected, disconnecting..");
self.disconnect(
id,
DisconnectReason::Dial(Arc::new(io::Error::from(
io::ErrorKind::AlreadyExists,
))),
);
return;
}
log::debug!(target: "wire", "Session established with {nid} (id={id}) (fd={fd})"); log::debug!(target: "wire", "Session established with {nid} (id={id}) (fd={fd})");
let conflicting = self let conflicting = self
@ -669,15 +680,15 @@ where
match err { match err {
reactor::Error::Poll(err) => { reactor::Error::Poll(err) => {
// 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::ListenerDisconnect(id, _) => { 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); log::error!(target: "wire", "Listener {id} disconnected");
} }
reactor::Error::TransportDisconnect(id, transport) => { reactor::Error::TransportDisconnect(id, transport) => {
let fd = transport.as_raw_fd(); let fd = transport.as_raw_fd();
log::error!(target: "wire", "Received error: peer id={id} (fd={fd}) disconnected"); log::error!(target: "wire", "Peer id={id} (fd={fd}) disconnected");
// We're dropping the TCP connection here. // We're dropping the TCP connection here.
drop(transport); drop(transport);
@ -715,7 +726,7 @@ where
Entry::Occupied(e) => { Entry::Occupied(e) => {
match e.get() { match e.get() {
Peer::Disconnecting { nid, reason, .. } => { Peer::Disconnecting { nid, reason, .. } => {
log::debug!(target: "wire", "Received transport handover for disconnecting peer with id={id} (fd={fd})"); log::debug!(target: "wire", "Transport handover for disconnecting peer with id={id} (fd={fd})");
// Disconnect TCP stream. // Disconnect TCP stream.
drop(transport); drop(transport);