From 800d3b0efa8219f67b3ce7887aaeaf683b7cd23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Tue, 12 May 2020 20:35:56 +0200 Subject: [PATCH] WIP: aquatic_ws: network: add ConnectionStage::is_established --- aquatic_ws/src/lib/network.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/aquatic_ws/src/lib/network.rs b/aquatic_ws/src/lib/network.rs index fde3eaa..a885841 100644 --- a/aquatic_ws/src/lib/network.rs +++ b/aquatic_ws/src/lib/network.rs @@ -38,6 +38,16 @@ pub enum ConnectionStage { } +impl ConnectionStage { + pub fn is_established(&self) -> bool { + match self { + Self::EstablishedWsTls(_) | Self::EstablishedWsNoTls(_) => true, + _ => false, + } + } +} + + pub struct Connection { valid_until: ValidUntil, stage: ConnectionStage, @@ -534,9 +544,7 @@ pub fn run_handshakes_and_read_messages( loop { let established = match connections.get(&poll_token).map(|c| &c.stage){ - Some(ConnectionStage::EstablishedWsTls(_)) => true, - Some(ConnectionStage::EstablishedWsNoTls(_)) => true, - Some(_) => false, + Some(stage) => stage.is_established(), None => break, };