fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-14 18:41:22 +00:00
Code Issues Projects Releases Wiki Activity

protocols/gossipsub: Handle unsupported peers (#2241)

Browse Source 
Previously, peers that did not support gossipsub were removed from the
connection-id mappings.

This can cause the connection_id mappings to go out of sync with those managed
by the swarm. This PR corrects this and adds an extra event that can inform the
user that a peer that does not support the protocol has connected. The user can
then optionally handle peers that don't support the protocol.
This commit is contained in:
Age Manning
2021-09-27 17:21:37 +10:00
committed by GitHub
parent c860f5a3a7
commit d93a5ab11c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
protocols/gossipsub/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# 0.33.0 [unreleased] # 0.33.0 [unreleased]
- Add an event to register peers that do not support the gossipsub protocol
[PR 2241](https://github.com/libp2p/rust-libp2p/pull/2241)
- Make default features of `libp2p-core` optional. - Make default features of `libp2p-core` optional.
[PR 2181](https://github.com/libp2p/rust-libp2p/pull/2181) [PR 2181](https://github.com/libp2p/rust-libp2p/pull/2181)

13
protocols/gossipsub/src/behaviour.rs
View File

@ -139,6 +139,8 @@ pub enum GossipsubEvent {
/// The topic it has subscribed from. /// The topic it has subscribed from.
topic: TopicHash, topic: TopicHash,
}, },
/// A peer that does not support gossipsub has connected.
GossipsubNotSupported { peer_id: PeerId },
} }
/// A data structure for storing configuration for publishing messages. See [`MessageAuthenticity`] /// A data structure for storing configuration for publishing messages. See [`MessageAuthenticity`]
@ -2995,9 +2997,7 @@ where
.connections .connections
.iter() .iter()
.position(|v| v == connection_id) .position(|v| v == connection_id)
.expect( .expect("Previously established connection to peer must be present");
"Previously established connection to a non-black-listed peer to be present",
);
connections.connections.remove(index); connections.connections.remove(index);
// If there are more connections and this peer is in a mesh, inform the first connection // If there are more connections and this peer is in a mesh, inform the first connection
@ -3066,8 +3066,11 @@ where
"Peer does not support gossipsub protocols. {}", "Peer does not support gossipsub protocols. {}",
propagation_source propagation_source
); );
// We treat this peer as disconnected self.events.push_back(NetworkBehaviourAction::GenerateEvent(
self.inject_disconnected(&propagation_source); GossipsubEvent::GossipsubNotSupported {
peer_id: propagation_source,
},
));
} else if let Some(conn) = self.connected_peers.get_mut(&propagation_source) { } else if let Some(conn) = self.connected_peers.get_mut(&propagation_source) {
// Only change the value if the old value is Floodsub (the default set in // Only change the value if the old value is Floodsub (the default set in
// inject_connected). All other PeerKind changes are ignored. // inject_connected). All other PeerKind changes are ignored.