github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-08 03:01:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(net): add client_version to session established events (#2379)

Browse Source
This commit is contained in:
mempirate
2023-04-25 10:45:02 +02:00
committed by GitHub
parent 21569180e1
commit c6e7ea513f
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/net/network/src/manager.rs
View File

@@ -637,6 +637,7 @@ where
SwarmEvent::SessionEstablished {
peer_id,
remote_addr,
client_version,
capabilities,
version,
messages,
@@ -649,6 +650,7 @@ where
info!(
target : "net",
?remote_addr,
client_version,
?peer_id,
?total_active,
"Session established"
@@ -664,6 +666,7 @@ where
this.event_listeners.send(NetworkEvent::SessionEstablished {
peer_id,
remote_addr,
client_version,
capabilities,
version,
status,
@@ -858,6 +861,8 @@ pub enum NetworkEvent {
peer_id: PeerId,
/// The remote addr of the peer to which a session was established.
remote_addr: SocketAddr,
/// The client version of the peer to which a session was established.
client_version: String,
/// Capabilities the peer announced
capabilities: Arc<Capabilities>,
/// A request channel to the session task.

4
crates/net/network/src/session/mod.rs
View File

@@ -462,7 +462,7 @@ impl SessionManager {
established: Instant::now(),
capabilities: Arc::clone(&capabilities),
commands_to_session,
client_version: client_id,
client_version: client_id.clone(),
remote_addr,
};
@@ -472,6 +472,7 @@ impl SessionManager {
Poll::Ready(SessionEvent::SessionEstablished {
peer_id,
remote_addr,
client_version: client_id,
version,
capabilities,
status,
@@ -588,6 +589,7 @@ pub(crate) enum SessionEvent {
SessionEstablished {
peer_id: PeerId,
remote_addr: SocketAddr,
client_version: String,
capabilities: Arc<Capabilities>,
/// negotiated eth version
version: EthVersion,

3
crates/net/network/src/swarm.rs
View File

@@ -125,6 +125,7 @@ where
SessionEvent::SessionEstablished {
peer_id,
remote_addr,
client_version,
capabilities,
version,
status,
@@ -142,6 +143,7 @@ where
Some(SwarmEvent::SessionEstablished {
peer_id,
remote_addr,
client_version,
capabilities,
version,
messages,
@@ -390,6 +392,7 @@ pub(crate) enum SwarmEvent {
SessionEstablished {
peer_id: PeerId,
remote_addr: SocketAddr,
client_version: String,
capabilities: Arc<Capabilities>,
/// negotiated eth version
version: EthVersion,

4
crates/net/network/src/transactions.rs
View File

@@ -796,6 +796,7 @@ mod tests {
NetworkEvent::SessionEstablished {
peer_id,
remote_addr,
client_version,
capabilities,
messages,
status,
@@ -805,6 +806,7 @@ mod tests {
transactions.on_network_event(NetworkEvent::SessionEstablished {
peer_id,
remote_addr,
client_version,
capabilities,
messages,
status,
@@ -873,6 +875,7 @@ mod tests {
NetworkEvent::SessionEstablished {
peer_id,
remote_addr,
client_version,
capabilities,
messages,
status,
@@ -880,6 +883,7 @@ mod tests {
} => transactions.on_network_event(NetworkEvent::SessionEstablished {
peer_id,
remote_addr,
client_version,
capabilities,
messages,
status,