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

protocols/ping: Log remote PeerId instead of payload (#2608)

Browse Source
This commit is contained in:
Elvis
2022-04-07 21:37:02 +02:00
committed by GitHub
parent 2ad905f35a
commit f5b982a13b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
protocols/ping/src/lib.rs
View File

@ -120,6 +120,14 @@ impl NetworkBehaviour for Behaviour {
_: &mut impl PollParameters, _: &mut impl PollParameters,
) -> Poll<NetworkBehaviourAction<Self::OutEvent, Self::ConnectionHandler>> { ) -> Poll<NetworkBehaviourAction<Self::OutEvent, Self::ConnectionHandler>> {
if let Some(e) = self.events.pop_back() { if let Some(e) = self.events.pop_back() {
let Event { result, peer } = &e;
match result {
Ok(Success::Ping { .. }) => log::debug!("Ping sent to {:?}", peer),
Ok(Success::Pong) => log::debug!("Ping received from {:?}", peer),
_ => {}
}
Poll::Ready(NetworkBehaviourAction::GenerateEvent(e)) Poll::Ready(NetworkBehaviourAction::GenerateEvent(e))
} else { } else {
Poll::Pending Poll::Pending

4
protocols/ping/src/protocol.rs
View File

@ -85,12 +85,10 @@ where
S: AsyncRead + AsyncWrite + Unpin, S: AsyncRead + AsyncWrite + Unpin,
{ {
let payload: [u8; PING_SIZE] = thread_rng().sample(distributions::Standard); let payload: [u8; PING_SIZE] = thread_rng().sample(distributions::Standard);
log::debug!("Preparing ping payload {:?}", payload);
stream.write_all(&payload).await?; stream.write_all(&payload).await?;
stream.flush().await?; stream.flush().await?;
let started = Instant::now(); let started = Instant::now();
let mut recv_payload = [0u8; PING_SIZE]; let mut recv_payload = [0u8; PING_SIZE];
log::debug!("Awaiting pong for {:?}", payload);
stream.read_exact(&mut recv_payload).await?; stream.read_exact(&mut recv_payload).await?;
if recv_payload == payload { if recv_payload == payload {
Ok((stream, started.elapsed())) Ok((stream, started.elapsed()))
@ -108,9 +106,7 @@ where
S: AsyncRead + AsyncWrite + Unpin, S: AsyncRead + AsyncWrite + Unpin,
{ {
let mut payload = [0u8; PING_SIZE]; let mut payload = [0u8; PING_SIZE];
log::debug!("Waiting for ping ...");
stream.read_exact(&mut payload).await?; stream.read_exact(&mut payload).await?;
log::debug!("Sending pong for {:?}", payload);
stream.write_all(&payload).await?; stream.write_all(&payload).await?;
stream.flush().await?; stream.flush().await?;
Ok(stream) Ok(stream)