diff --git a/backend/src/bin/embassy-init.rs b/backend/src/bin/embassy-init.rs index ddc5fcdbf..2f680de05 100644 --- a/backend/src/bin/embassy-init.rs +++ b/backend/src/bin/embassy-init.rs @@ -1,4 +1,4 @@ -use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr}; +use std::net::{Ipv6Addr, SocketAddr}; use std::path::{Path, PathBuf}; use std::sync::Arc; use std::time::Duration; @@ -61,10 +61,7 @@ async fn setup_or_init(cfg_path: Option) -> Result<(), Error> { let ctx = InstallContext::init(cfg_path).await?; let server = WebServer::install( - [ - SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 80), - SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), - ], + SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), ctx.clone(), ) .await?; @@ -90,10 +87,7 @@ async fn setup_or_init(cfg_path: Option) -> Result<(), Error> { let ctx = SetupContext::init(cfg_path).await?; let server = WebServer::setup( - [ - SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 80), - SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), - ], + SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), ctx.clone(), ) .await?; @@ -208,10 +202,7 @@ async fn inner_main(cfg_path: Option) -> Result, Error .await?; let server = WebServer::diagnostic( - [ - SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 80), - SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), - ], + SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), ctx.clone(), ) .await?; diff --git a/backend/src/bin/embassyd.rs b/backend/src/bin/embassyd.rs index 6b3d5e188..7bfffe717 100644 --- a/backend/src/bin/embassyd.rs +++ b/backend/src/bin/embassyd.rs @@ -1,4 +1,4 @@ -use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr}; +use std::net::{Ipv6Addr, SocketAddr}; use std::path::{Path, PathBuf}; use std::sync::Arc; @@ -28,10 +28,7 @@ async fn inner_main(cfg_path: Option) -> Result, Error .await?; embassy::hostname::sync_hostname(&rpc_ctx.account.read().await.hostname).await?; let server = WebServer::main( - [ - SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 80), - SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), - ], + SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), rpc_ctx.clone(), ) .await?; @@ -150,10 +147,7 @@ fn main() { .await?; let server = WebServer::diagnostic( - [ - SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 80), - SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), - ], + SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80), ctx.clone(), ) .await?; diff --git a/backend/src/net/vhost.rs b/backend/src/net/vhost.rs index 94952bd43..bb3857427 100644 --- a/backend/src/net/vhost.rs +++ b/backend/src/net/vhost.rs @@ -88,20 +88,15 @@ struct VHostServer { impl VHostServer { async fn new(port: u16, ssl: Arc) -> Result { // check if port allowed - let listeners = TcpListeners::new([ - TcpListener::bind(SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), port)) - .await - .with_kind(crate::ErrorKind::Network)?, - TcpListener::bind(SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), port)) - .await - .with_kind(crate::ErrorKind::Network)?, - ]); + let listener = TcpListener::bind(SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), port)) + .await + .with_kind(crate::ErrorKind::Network)?; let mapping = Arc::new(RwLock::new(BTreeMap::new())); Ok(Self { mapping: Arc::downgrade(&mapping), _thread: tokio::spawn(async move { loop { - match listeners.accept().await { + match listener.accept().await { Ok((stream, _)) => { let mut stream = BackTrackingReader::new(stream); stream.start_buffering();