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

Add a with_simple_protocol_upgrade alternative to with_upgrade

Browse Source
This commit is contained in:
Pierre Krieger
2017-12-01 14:30:08 +01:00
parent 16937910c2
commit 4881c4a6a1
3 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
example/examples/echo-dialer.rs
View File

@ -26,15 +26,11 @@ extern crate libp2p_tcp_transport as tcp;
extern crate tokio_core;
extern crate tokio_io;
use bytes::Bytes;
use futures::future::{Future, FutureResult, IntoFuture};
use futures::{Stream, Sink};
use std::io::Error as IoError;
use std::iter;
use swarm::{Transport, ConnectionUpgrade};
use bytes::BytesMut;
use futures::{Stream, Sink, Future};
use swarm::Transport;
use tcp::TcpConfig;
use tokio_core::reactor::Core;
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_io::codec::length_delimited;
fn main() {
@ -51,11 +47,12 @@ fn main() {
}
});
let with_echo = with_secio.with_upgrade(Echo);
let with_echo = with_secio.with_simple_protocol_upgrade("/echo/1.0.0", |socket| {
Ok(length_delimited::Framed::<_, BytesMut>::new(socket))
});
let dialer = with_echo.dial(swarm::multiaddr::Multiaddr::new("/ip4/127.0.0.1/tcp/10333").unwrap())
.map_err(|_| panic!())
.unwrap()
.unwrap_or_else(|_| panic!())
.and_then(|f| {
f.send("hello world".into())
})
@ -70,26 +67,3 @@ fn main() {
core.run(dialer).unwrap();
}
// TODO: copy-pasted from echo-server
#[derive(Debug, Copy, Clone)]
pub struct Echo;
impl<C> ConnectionUpgrade<C> for Echo
where C: AsyncRead + AsyncWrite
{
type NamesIter = iter::Once<(Bytes, Self::UpgradeIdentifier)>;
type UpgradeIdentifier = ();
#[inline]
fn protocol_names(&self) -> Self::NamesIter {
iter::once(("/echo/1.0.0".into(), ()))
}
type Output = length_delimited::Framed<C>;
type Future = FutureResult<Self::Output, IoError>;
#[inline]
fn upgrade(self, socket: C, _: Self::UpgradeIdentifier) -> Self::Future {
Ok(length_delimited::Framed::new(socket)).into_future()
}
}