server: reorganise setup, pass Global to route

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

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 8effeff9c2102b5a1bdf9b416bf349d2cce638b1..1cc0660414a101f0caa6a2a4e657e2380f4ddc9c 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -16,13 +16,13 @@ pub struct Opts {
 const METADATA_MAX_LEN: usize = MAX_OVERHEAD;
 
 #[derive(Debug)]
-struct Global {
+pub struct Global {
   config: config::InstanceConfigGlobal,
-  all_clients: HashMap<ClientName, ClientHandles>,
+  all_clients: HashMap<ClientName, Client>,
 }
 
 #[derive(Debug)]
-struct ClientHandles {
+pub struct Client {
   ic: Arc<InstanceConfig>,
   web: tokio::sync::mpsc::Sender<WebRequest>,
 }
@@ -55,7 +55,8 @@ struct WebResponse {
 type WebResponseData = Vec<u8>;
 
 #[throws(PacketError)]
-pub fn route_packet(conn: &str, link: &dyn Display,
+pub fn route_packet(_global: &Global,
+                    conn: &str, link: &dyn Display,
                     packet: Box<[u8]>, daddr: IpAddr)
 {
   // xxx
@@ -259,7 +260,8 @@ async fn handle(
 
 #[allow(unused_variables)] // xxx
 #[allow(unused_mut)] // xxx
-async fn run_client(ic: Arc<InstanceConfig>,
+async fn run_client(global: Arc<Global>,
+                    ic: Arc<InstanceConfig>,
                     mut web: mpsc::Receiver<WebRequest>)
                     -> Result<Void, AE>
 {
@@ -384,7 +386,7 @@ async fn run_client(ic: Arc<InstanceConfig>,
               let daddr = ip_packet_addr::<true>(header)?;
               Ok(daddr)
             }, |(daddr,packet)| route_packet(
-              &conn, &ic.link.client, daddr,packet
+              &global, &conn, &ic.link.client, daddr,packet
             ),
               |e| Ok::<_,SlipFramesError<_>>({ warnings.add(&e)?; })
             )?;
@@ -422,32 +424,43 @@ async fn main() {
     &opts.config, &opts.log, |ics|
   {
     let global_config = config::InstanceConfigGlobal::from(&ics);
-    let ipif = Ipif::start(&global_config.ipif, None)?;
 
-    let all_clients = 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
-      );
-
-      let ic_ = ic.clone();
-      tasks.push((tokio::spawn(async move {
-        run_client(ic_, web_recv).await.void_unwrap_err()
-      }), format!("client {}", &ic)));
+        // marked client-only so needs rework
+      )).unzip::<_,_,Vec<_>,Vec<_>>();
 
+    let all_clients = izip!(
+      &ics,
+      client_handles_send,
+    ).map(|(ic, web_send)| {
       (ic.link.client,
-       ClientHandles {
-         ic,
+       Client {
+         ic: ic.clone(),
          web: web_send,
        })
     }).collect();
+
     let global = Arc::new(Global {
       config: global_config,
       all_clients,
     });
 
+    for (ic, web_recv) in izip!(
+      ics,
+      client_handles_recv,
+    ) {
+      let global_ = global.clone();
+      let ic_ = ic.clone();
+      tasks.push((tokio::spawn(async move {
+        run_client(global_, ic_, web_recv).await.void_unwrap_err()
+      }), format!("client {}", &ic)));
+    }
+
     for addr in &global.config.addrs {
       let global_ = global.clone();
       let make_service = hyper::service::make_service_fn(