From 951c4e90b573f3d14a137bade0853fb3f0f21a5d Mon Sep 17 00:00:00 2001
From: Lia Lenckowski <lialenck@protonmail.com>
Date: Mon, 28 Aug 2023 12:42:43 +0200
Subject: supporting listening on a list of addresses

Signed-off-by: metamuffin <metamuffin@disroot.org>
---
 src/main.rs | 59 +++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 20 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index f51cd67..aa13609 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,6 +14,7 @@ use crate::{
 };
 use anyhow::{anyhow, bail, Context, Result};
 use error::ServiceError;
+use futures::future::try_join_all;
 use http_body_util::{combinators::BoxBody, BodyExt};
 use hyper::{
     body::Incoming,
@@ -88,14 +89,24 @@ async fn serve_http(state: Arc<State>) -> Result<()> {
         Some(n) => n,
         None => return Ok(()),
     };
-    let listener = TcpListener::bind(http_config.bind).await?;
+
+    let listen_futs: Result<Vec<()>> = try_join_all(http_config.bind
+        .iter()
+        .map(|e| async {
+            let l = TcpListener::bind(e.clone()).await?;
+            loop {
+                let (stream, addr) = l.accept().await.context("accepting connection")?;
+                debug!("connection from {addr}");
+                let config = state.clone();
+                tokio::spawn(async move { serve_stream(config, stream, addr).await });
+            }
+        }))
+        .await;
+
     info!("serving http");
-    loop {
-        let (stream, addr) = listener.accept().await.context("accepting connection")?;
-        debug!("connection from {addr}");
-        let config = state.clone();
-        tokio::spawn(async move { serve_stream(config, stream, addr).await });
-    }
+
+    listen_futs?;
+    Ok(())
 }
 
 async fn serve_https(state: Arc<State>) -> Result<()> {
@@ -116,22 +127,30 @@ async fn serve_https(state: Arc<State>) -> Result<()> {
         ];
         Arc::new(cfg)
     };
-    let listener = TcpListener::bind(https_config.bind).await?;
     let tls_acceptor = Arc::new(TlsAcceptor::from(tls_config));
 
+    let listen_futs: Result<Vec<()>> = try_join_all(https_config.bind
+        .iter()
+        .map(|e| async {
+            let l = TcpListener::bind(e.clone()).await?;
+            loop {
+                let (stream, addr) = l.accept().await.context("accepting connection")?;
+                let state = state.clone();
+                let tls_acceptor = tls_acceptor.clone();
+                tokio::task::spawn(async move {
+                    debug!("connection from {addr}");
+                    match tls_acceptor.accept(stream).await {
+                        Ok(stream) => serve_stream(state, stream, addr).await,
+                        Err(e) => warn!("error accepting tls: {e}"),
+                    };
+                });
+            }
+        }))
+        .await;
+
     info!("serving https");
-    loop {
-        let (stream, addr) = listener.accept().await.context("accepting connection")?;
-        let state = state.clone();
-        let tls_acceptor = tls_acceptor.clone();
-        tokio::task::spawn(async move {
-            debug!("connection from {addr}");
-            match tls_acceptor.accept(stream).await {
-                Ok(stream) => serve_stream(state, stream, addr).await,
-                Err(e) => warn!("error accepting tls: {e}"),
-            };
-        });
-    }
+    listen_futs?;
+    Ok(())
 }
 
 pub async fn serve_stream<T: AsyncRead + AsyncWrite + Unpin + Send + 'static>(
-- 
cgit v1.2.3-70-g09d2