fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-24 15:21:33 +00:00
Code Issues Projects Releases Wiki Activity

protocols/relay/src/v2: Remove empty peer entries in self.reservations (#2464)

Browse Source 
When a peer disconnects, reservations associated with that peer are removed from
the set of reservations of the peer. In case the set of reservations for the
peer is now empty, remove the entire peer.

Same when a reservation times out.
This commit is contained in:
Max Inden
2022-02-01 19:32:58 +01:00
committed by GitHub
parent 13ded7f6a8
commit 6338b25e4b
5 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
protocols/relay/src/v2/relay.rs
View File

@ -35,7 +35,7 @@ use libp2p_swarm::{
NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters,
ProtocolsHandlerUpgrErr,
};
use std::collections::{HashMap, HashSet, VecDeque};
use std::collections::{hash_map, HashMap, HashSet, VecDeque};
use std::num::NonZeroU32;
use std::ops::Add;
use std::task::{Context, Poll};
@ -214,8 +214,11 @@ impl NetworkBehaviour for Relay {
_: &ConnectedPoint,
_handler: Either<handler::Handler, DummyProtocolsHandler>,
) {
if let Some(connections) = self.reservations.get_mut(peer) {
connections.remove(&connection);
if let hash_map::Entry::Occupied(mut peer) = self.reservations.entry(*peer) {
peer.get_mut().remove(&connection);
if peer.get().is_empty() {
peer.remove();
}
}
for circuit in self
@ -353,9 +356,21 @@ impl NetworkBehaviour for Relay {
);
}
handler::Event::ReservationTimedOut {} => {
self.reservations
.get_mut(&event_source)
.map(|cs| cs.remove(&connection));
match self.reservations.entry(event_source) {
hash_map::Entry::Occupied(mut peer) => {
peer.get_mut().remove(&connection);
if peer.get().is_empty() {
peer.remove();
}
}
hash_map::Entry::Vacant(_) => {
unreachable!(
"Expect to track timed out reservation with peer {:?} on connection {:?}",
event_source,
connection,
);
}
}
self.queued_actions.push_back(
NetworkBehaviourAction::GenerateEvent(Event::ReservationTimedOut {