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

swarm/src/behaviour: Merge inject_* paired methods (#2445)

Browse Source 
Co-authored-by: Max Inden <mail@max-inden.de>
This commit is contained in:
Divma
2022-02-09 10:08:28 -05:00
committed by GitHub
parent 5a95a46cd3
commit dc8433e3fc
30 changed files with 583 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
protocols/autonat/src/behaviour.rs
View File

@ -303,9 +303,15 @@ impl NetworkBehaviour for Behaviour {
conn: &ConnectionId,
endpoint: &ConnectedPoint,
failed_addresses: Option<&Vec<Multiaddr>>,
other_established: usize,
) {
self.inner
.inject_connection_established(peer, conn, endpoint, failed_addresses);
self.inner.inject_connection_established(
peer,
conn,
endpoint,
failed_addresses,
other_established,
);
let connections = self.connected.entry(*peer).or_default();
let addr = if endpoint.is_relayed() {
None
@ -342,11 +348,16 @@ impl NetworkBehaviour for Behaviour {
conn: &ConnectionId,
endpoint: &ConnectedPoint,
handler: <Self::ProtocolsHandler as IntoProtocolsHandler>::Handler,
remaining_established: usize,
) {
self.inner
.inject_connection_closed(peer, conn, endpoint, handler);
let connections = self.connected.get_mut(peer).expect("Peer is connected.");
connections.remove(conn);
.inject_connection_closed(peer, conn, endpoint, handler, remaining_established);
if remaining_established == 0 {
self.connected.remove(peer);
} else {
let connections = self.connected.get_mut(peer).expect("Peer is connected.");
connections.remove(conn);
}
}
fn inject_dial_failure(
@ -362,11 +373,6 @@ impl NetworkBehaviour for Behaviour {
}
}
fn inject_disconnected(&mut self, peer: &PeerId) {
self.inner.inject_disconnected(peer);
self.connected.remove(peer);
}
fn inject_address_change(
&mut self,
peer: &PeerId,
@ -461,10 +467,6 @@ impl NetworkBehaviour for Behaviour {
self.inner.addresses_of_peer(peer)
}
fn inject_connected(&mut self, peer: &PeerId) {
self.inner.inject_connected(peer)
}
fn inject_event(
&mut self,
peer_id: PeerId,