From b1ce398dff022eabd0077cd9ce90a79d046fa294 Mon Sep 17 00:00:00 2001 From: mempirate Date: Thu, 15 Dec 2022 22:37:03 +0100 Subject: [PATCH] feat(net): add `Status` to session established event (#473) --- crates/net/network/src/manager.rs | 6 +++++- crates/net/network/src/swarm.rs | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/crates/net/network/src/manager.rs b/crates/net/network/src/manager.rs index 733ab6979e..243287e6fd 100644 --- a/crates/net/network/src/manager.rs +++ b/crates/net/network/src/manager.rs @@ -35,7 +35,7 @@ use futures::{Future, StreamExt}; use parking_lot::Mutex; use reth_eth_wire::{ capability::{Capabilities, CapabilityMessage}, - DisconnectReason, + DisconnectReason, Status, }; use reth_primitives::{PeerId, H256}; use reth_provider::BlockProvider; @@ -522,6 +522,7 @@ where remote_addr, capabilities, messages, + status, direction, } => { let total_active = this.num_active_peers.fetch_add(1, Ordering::Relaxed) + 1; @@ -543,6 +544,7 @@ where this.event_listeners.send(NetworkEvent::SessionEstablished { peer_id, capabilities, + status, messages, }); } @@ -645,6 +647,8 @@ pub enum NetworkEvent { capabilities: Arc, /// A request channel to the session task. messages: PeerRequestSender, + /// The status of the peer to which a session was established. + status: Status, }, } diff --git a/crates/net/network/src/swarm.rs b/crates/net/network/src/swarm.rs index dc5efe58fe..4577c36efe 100644 --- a/crates/net/network/src/swarm.rs +++ b/crates/net/network/src/swarm.rs @@ -9,6 +9,7 @@ use futures::Stream; use reth_eth_wire::{ capability::{Capabilities, CapabilityMessage}, error::EthStreamError, + Status, }; use reth_primitives::PeerId; use reth_provider::BlockProvider; @@ -132,6 +133,7 @@ where remote_addr, capabilities, messages, + status, direction, }) } @@ -325,6 +327,7 @@ pub(crate) enum SwarmEvent { remote_addr: SocketAddr, capabilities: Arc, messages: PeerRequestSender, + status: Status, direction: Direction, }, SessionClosed {