server: reorganise setup

[hippotat.git] / src / bin / server.rs

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 4b5fc527d25c090d4d34530e88a1abbaed66ddcc..297740a1552ff729de9b71c3f6a5c902f54502d6 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -15,9 +15,14 @@ pub struct Opts {
 
 const METADATA_MAX_LEN: usize = MAX_OVERHEAD;
 
-type AllClients = HashMap<ClientName, ClientHandles>;
+#[derive(Debug)]
+struct Global {
+  config: config::InstanceConfigGlobal,
+  all_clients: HashMap<ClientName, Client>,
+}
 
-struct ClientHandles {
+#[derive(Debug)]
+struct Client {
   ic: Arc<InstanceConfig>,
   web: tokio::sync::mpsc::Sender<WebRequest>,
 }
@@ -60,7 +65,7 @@ pub fn route_packet(conn: &str, link: &dyn Display,
 
 async fn handle(
   conn: Arc<String>,
-  all_clients: Arc<AllClients>,
+  global: Arc<Global>,
   req: hyper::Request<hyper::Body>
 ) -> Result<hyper::Response<hyper::Body>, hyper::http::Error> {
   if req.method() == Method::GET {
@@ -157,7 +162,7 @@ async fn handle(
     let hmac_got = &hmac_got[0..hmac_got_l];
 
     let client_name = client;
-    let client = all_clients.get(&client_name);
+    let client = global.all_clients.get(&client_name);
 
     // We attempt to hide whether the client exists we don't try to
     // hide the hash lookup computationgs, but we do try to hide the
@@ -416,43 +421,53 @@ async fn main() {
     "hippotatd", LinkEnd::Server,
     &opts.config, &opts.log, |ics|
   {
-    let global = config::InstanceConfigGlobal::from(&ics);
-    let ipif = Ipif::start(&global.ipif, None)?;
+    let global_config = config::InstanceConfigGlobal::from(&ics);
 
-    let all_clients: AllClients = ics.into_iter().map(|ic| {
-      let ic = Arc::new(ic);
+    let ipif = Ipif::start(&global_config.ipif, None)?;
 
-      let (web_send, web_recv) = mpsc::channel(
+    let ics = ics.into_iter().map(Arc::new).collect_vec();
+    let (client_handles_send, client_handles_recv) = ics.iter()
+      .map(|_ic| mpsc::channel(
         5 // xxx should me max_requests_outstanding but that's
-          // marked client-only so needs rework
-      );
+        // marked client-only so needs rework
+      )).unzip::<_,_,Vec<_>,Vec<_>>();
+
+    let all_clients = izip!(
+      ics.into_iter(),
+      client_handles_send,
+      client_handles_recv,
+    ).map(|(ic, web_send, web_recv)| {
+      let r = (ic.link.client,
+           Client {
+             ic: ic.clone(),
+             web: web_send,
+           });
 
       let ic_ = ic.clone();
       tasks.push((tokio::spawn(async move {
         run_client(ic_, web_recv).await.void_unwrap_err()
       }), format!("client {}", &ic)));
 
-      (ic.link.client,
-       ClientHandles {
-         ic,
-         web: web_send,
-       })
+      r
     }).collect();
-    let all_clients = Arc::new(all_clients);
+    let global = Arc::new(Global {
+      config: global_config,
+      all_clients,
+    });
 
-    for addr in &global.addrs {
-      let all_clients_ = all_clients.clone();
+    for addr in &global.config.addrs {
+      let global_ = global.clone();
       let make_service = hyper::service::make_service_fn(
         move |conn: &hyper::server::conn::AddrStream| {
-          let all_clients_ = all_clients_.clone();
+          let global_ = global_.clone();
           let conn = Arc::new(format!("[{}]", conn.remote_addr()));
           async { Ok::<_, Void>( hyper::service::service_fn(move |req| {
-            handle(conn.clone(), all_clients_.clone(), req)
+            handle(conn.clone(), global_.clone(), req)
           }) ) }
         }
       );
 
-      let addr = SocketAddr::new(*addr, global.port);
+      let addr = SocketAddr::new(*addr, global.config.port);
       let server = hyper::Server::try_bind(&addr)
         .context("bind")?
         .http1_preserve_header_case(true)