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

Make the Pinger clonable (#330)

Browse Source
This commit is contained in:
Pierre Krieger
2018-07-18 18:47:58 +02:00
committed by GitHub
parent bd169a5a4b
commit 7507e0bfd9
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ping/Cargo.toml
View File

@ -11,7 +11,7 @@ multiaddr = { path = "../multiaddr" }
multistream-select = { path = "../multistream-select" } multistream-select = { path = "../multistream-select" }
futures = "0.1" futures = "0.1"
parking_lot = "0.5" parking_lot = "0.5"
rand = "0.3" rand = "0.5"
tokio-codec = "0.1" tokio-codec = "0.1"
tokio-io = "0.1" tokio-io = "0.1"

24
ping/src/lib.rs
View File

@ -93,8 +93,7 @@ use futures::sync::{mpsc, oneshot};
use futures::{Future, Sink, Stream}; use futures::{Future, Sink, Stream};
use libp2p_core::{ConnectionUpgrade, Endpoint}; use libp2p_core::{ConnectionUpgrade, Endpoint};
use parking_lot::Mutex; use parking_lot::Mutex;
use rand::os::OsRng; use rand::{prelude::*, rngs::EntropyRng, distributions::Standard};
use rand::Rand;
use std::collections::HashMap; use std::collections::HashMap;
use std::error::Error; use std::error::Error;
use std::io::Error as IoError; use std::io::Error as IoError;
@ -145,14 +144,9 @@ where
// never produce anything. // never produce anything.
let rx = rx.then(|r| Ok(r.ok())).filter_map(|a| a); let rx = rx.then(|r| Ok(r.ok())).filter_map(|a| a);
let os_rng = match OsRng::new() {
Ok(r) => r,
Err(err) => return Err(err).into_future(),
};
let pinger = Pinger { let pinger = Pinger {
send: tx, send: tx,
os_rng: os_rng, rng: EntropyRng::default(),
}; };
// Hashmap that associates outgoing payloads to one-shot senders. // Hashmap that associates outgoing payloads to one-shot senders.
@ -219,7 +213,7 @@ where
/// Controller for the ping service. Makes it possible to send pings to the remote. /// Controller for the ping service. Makes it possible to send pings to the remote.
pub struct Pinger { pub struct Pinger {
send: mpsc::Sender<Message>, send: mpsc::Sender<Message>,
os_rng: OsRng, rng: EntropyRng,
} }
impl Pinger { impl Pinger {
@ -229,7 +223,8 @@ impl Pinger {
/// timeout yourself when you call this function. /// timeout yourself when you call this function.
pub fn ping(&mut self) -> Box<Future<Item = (), Error = Box<Error + Send + Sync>>> { pub fn ping(&mut self) -> Box<Future<Item = (), Error = Box<Error + Send + Sync>>> {
let (tx, rx) = oneshot::channel(); let (tx, rx) = oneshot::channel();
let payload: [u8; 32] = Rand::rand(&mut self.os_rng);
let payload: [u8; 32] = self.rng.sample(Standard);
debug!("Preparing for ping with payload {:?}", payload); debug!("Preparing for ping with payload {:?}", payload);
// Ignore errors if the ponger has been already destroyed. The returned future will never // Ignore errors if the ponger has been already destroyed. The returned future will never
// be signalled. // be signalled.
@ -242,6 +237,15 @@ impl Pinger {
} }
} }
impl Clone for Pinger {
fn clone(&self) -> Pinger {
Pinger {
send: self.send.clone(),
rng: EntropyRng::default(),
}
}
}
enum Message { enum Message {
Ping(Bytes, oneshot::Sender<()>), Ping(Bytes, oneshot::Sender<()>),
Received(Bytes), Received(Bytes),