YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 18:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_ws: move more code into Connection impl

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-13 20:02:05 +02:00
parent 7011a797ee
commit 63b84e7706
2 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

41
aquatic_ws/src/lib/network/common.rs
View file

@ -73,12 +73,6 @@ impl Write for Stream {
} }
pub struct EstablishedWs {
pub ws: WebSocket<Stream>,
pub peer_addr: SocketAddr,
}
pub enum HandshakeMachine { pub enum HandshakeMachine {
TcpStream(TcpStream), TcpStream(TcpStream),
TlsStream(TlsStream<TcpStream>), TlsStream(TlsStream<TcpStream>),
@ -181,27 +175,31 @@ impl HandshakeMachine {
} }
pub struct EstablishedWs {
pub ws: WebSocket<Stream>,
pub peer_addr: SocketAddr,
}
pub struct Connection { pub struct Connection {
pub valid_until: ValidUntil, pub valid_until: ValidUntil,
inner: Either<EstablishedWs, HandshakeMachine>, inner: Either<EstablishedWs, HandshakeMachine>,
} }
/// Create from TcpStream. Run `advance_handshakes` until `get_established_ws`
/// returns Some(EstablishedWs).
impl Connection { impl Connection {
pub fn new( pub fn new(
valid_until: ValidUntil, valid_until: ValidUntil,
inner: Either<EstablishedWs, HandshakeMachine> tcp_stream: TcpStream,
) -> Self { ) -> Self {
Self { Self {
valid_until, valid_until,
inner inner: Either::Right(HandshakeMachine::TcpStream(tcp_stream))
} }
} }
pub fn is_established(&self) -> bool {
self.inner.is_left()
}
pub fn get_established_ws<'a>(&mut self) -> Option<&mut EstablishedWs> { pub fn get_established_ws<'a>(&mut self) -> Option<&mut EstablishedWs> {
match self.inner { match self.inner {
Either::Left(ref mut ews) => Some(ews), Either::Left(ref mut ews) => Some(ews),
@ -209,10 +207,23 @@ impl Connection {
} }
} }
pub fn get_machine(self) -> Option<HandshakeMachine> { pub fn advance_handshakes(
self,
opt_tls_acceptor: &Option<TlsAcceptor>,
valid_until: ValidUntil,
) -> (Option<Self>, bool) {
match self.inner { match self.inner {
Either::Left(_) => None, Either::Left(_) => (Some(self), false),
Either::Right(machine) => Some(machine), Either::Right(machine) => {
let (opt_inner, stop_loop) = machine.advance(opt_tls_acceptor);
let opt_new_self = opt_inner.map(|inner| Self {
valid_until,
inner
});
(opt_new_self, stop_loop)
}
} }
} }

19
aquatic_ws/src/lib/network/mod.rs
View file

@ -116,10 +116,7 @@ fn accept_new_streams(
.register(&mut stream, token, Interest::READABLE) .register(&mut stream, token, Interest::READABLE)
.unwrap(); .unwrap();
let connection = Connection::new( let connection = Connection::new(valid_until, stream);
valid_until,
Either::Right(HandshakeMachine::new(stream))
);
connections.insert(token, connection); connections.insert(token, connection);
}, },
@ -178,15 +175,13 @@ pub fn run_handshakes_and_read_messages(
break; break;
} }
} }
} else if let Some(machine) = connections.remove(&poll_token) } else if let Some(connection) = connections.remove(&poll_token){
.and_then(Connection::get_machine) let (opt_new_connection, stop_loop) = connection.advance_handshakes(
{ opt_tls_acceptor,
let (result, stop_loop) = machine valid_until
.advance(opt_tls_acceptor); );
if let Some(inner) = result {
let connection = Connection::new(valid_until, inner);
if let Some(connection) = opt_new_connection {
connections.insert(poll_token, connection); connections.insert(poll_token, connection);
} }