ws: use file naming more in line with other impls; other small fixes

aquatic_ws/src/mio/socket/utils.rs

@@ -0,0 +1,66 @@
+use std::time::Instant;
+
+use anyhow::Context;
+use mio::{Poll, Token};
+use socket2::{Domain, Protocol, Socket, Type};
+
+use crate::config::Config;
+
+use super::connection::*;
+
+pub fn create_listener(config: &Config) -> ::anyhow::Result<::std::net::TcpListener> {
+    let builder = if config.network.address.is_ipv4() {
+        Socket::new(Domain::IPV4, Type::STREAM, Some(Protocol::TCP))
+    } else {
+        Socket::new(Domain::IPV6, Type::STREAM, Some(Protocol::TCP))
+    }
+    .context("Couldn't create socket2::Socket")?;
+
+    if config.network.ipv6_only {
+        builder
+            .set_only_v6(true)
+            .context("Couldn't put socket in ipv6 only mode")?
+    }
+
+    builder
+        .set_nonblocking(true)
+        .context("Couldn't put socket in non-blocking mode")?;
+    builder
+        .set_reuse_port(true)
+        .context("Couldn't put socket in reuse_port mode")?;
+    builder
+        .bind(&config.network.address.into())
+        .with_context(|| format!("Couldn't bind socket to address {}", config.network.address))?;
+    builder
+        .listen(128)
+        .context("Couldn't listen for connections on socket")?;
+
+    Ok(builder.into())
+}
+
+pub fn remove_connection_if_exists(poll: &mut Poll, connections: &mut ConnectionMap, token: Token) {
+    if let Some(mut connection) = connections.remove(&token) {
+        connection.close();
+
+        if let Err(err) = connection.deregister(poll) {
+            ::log::error!("couldn't deregister stream: {}", err);
+        }
+    }
+}
+
+// Close and remove inactive connections
+pub fn remove_inactive_connections(connections: &mut ConnectionMap) {
+    let now = Instant::now();
+
+    connections.retain(|_, connection| {
+        if connection.valid_until.0 < now {
+            connection.close();
+
+            false
+        } else {
+            true
+        }
+    });
+
+    connections.shrink_to_fit();
+}