pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

starttls: parameterize TcpStream

Browse source
This commit is contained in:
Astro 2017-06-05 00:45:16 +02:00
parent a618acd6d6
commit 98e7a2fbf4
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/starttls.rs
View file

@ -4,7 +4,7 @@ use std::sync::Arc;
use futures::{Future, Sink, Poll, Async}; use futures::{Future, Sink, Poll, Async};
use futures::stream::Stream; use futures::stream::Stream;
use futures::sink; use futures::sink;
use tokio_core::net::TcpStream; use tokio_io::{AsyncRead, AsyncWrite};
use rustls::*; use rustls::*;
use tokio_rustls::*; use tokio_rustls::*;
use xml; use xml;
@ -15,22 +15,22 @@ use super::{XMPPStream, XMPPCodec, Packet};
const NS_XMPP_STREAM: &str = "http://etherx.jabber.org/streams"; const NS_XMPP_STREAM: &str = "http://etherx.jabber.org/streams";
const NS_XMPP_TLS: &str = "urn:ietf:params:xml:ns:xmpp-tls"; const NS_XMPP_TLS: &str = "urn:ietf:params:xml:ns:xmpp-tls";
pub struct StartTlsClient { pub struct StartTlsClient<S: AsyncWrite> {
state: StartTlsClientState, state: StartTlsClientState<S>,
arc_config: Arc<ClientConfig>, arc_config: Arc<ClientConfig>,
} }
enum StartTlsClientState { enum StartTlsClientState<S: AsyncWrite> {
Invalid, Invalid,
AwaitFeatures(XMPPStream<TcpStream>), AwaitFeatures(XMPPStream<S>),
SendStartTls(sink::Send<XMPPStream<TcpStream>>), SendStartTls(sink::Send<XMPPStream<S>>),
AwaitProceed(XMPPStream<TcpStream>), AwaitProceed(XMPPStream<S>),
StartingTls(ConnectAsync<TcpStream>), StartingTls(ConnectAsync<S>),
} }
impl StartTlsClient { impl<S: AsyncWrite> StartTlsClient<S> {
/// Waits for <stream:features> /// Waits for <stream:features>
pub fn from_stream(xmpp_stream: XMPPStream<TcpStream>, arc_config: Arc<ClientConfig>) -> Self { pub fn from_stream(xmpp_stream: XMPPStream<S>, arc_config: Arc<ClientConfig>) -> Self {
StartTlsClient { StartTlsClient {
state: StartTlsClientState::AwaitFeatures(xmpp_stream), state: StartTlsClientState::AwaitFeatures(xmpp_stream),
arc_config: arc_config, arc_config: arc_config,
@ -39,8 +39,8 @@ impl StartTlsClient {
} }
// TODO: eval <stream:features>, check ns // TODO: eval <stream:features>, check ns
impl Future for StartTlsClient { impl<S: AsyncRead + AsyncWrite> Future for StartTlsClient<S> {
type Item = XMPPStream<TlsStream<TcpStream, ClientSession>>; type Item = XMPPStream<TlsStream<S, ClientSession>>;
type Error = Error; type Error = Error;
fn poll(&mut self) -> Poll<Self::Item, Self::Error> { fn poll(&mut self) -> Poll<Self::Item, Self::Error> {