server: introduce RoutedPacket

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

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 4b5fc527d25c090d4d34530e88a1abbaed66ddcc..a8cb59012735fd445b412cc8fc9534028d0d7f75 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -15,13 +15,20 @@ pub struct Opts {
 
 const METADATA_MAX_LEN: usize = MAX_OVERHEAD;
 
-type AllClients = HashMap<ClientName, ClientHandles>;
+#[derive(Debug)]
+pub struct Global {
+  config: config::InstanceConfigGlobal,
+  all_clients: HashMap<ClientName, Client>,
+}
 
-struct ClientHandles {
+#[derive(Debug)]
+pub struct Client {
   ic: Arc<InstanceConfig>,
   web: tokio::sync::mpsc::Sender<WebRequest>,
 }
 
+pub type RoutedPacket = Box<[u8]>; // not MIME data
+
 /// Sent from hyper worker pool task to client task
 #[allow(dead_code)] // xxx
 #[derive(Debug)]
@@ -50,8 +57,9 @@ struct WebResponse {
 type WebResponseData = Vec<u8>;
 
 #[throws(PacketError)]
-pub fn route_packet(conn: &str, link: &dyn Display,
-                    packet: Box<[u8]>, daddr: IpAddr)
+pub fn route_packet(_global: &Global,
+                    conn: &str, link: &dyn Display,
+                    packet: RoutedPacket, daddr: IpAddr)
 {
   // xxx
   trace!("{} {} discarding packet daddr={:?} len={}",
@@ -60,7 +68,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 +165,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
@@ -254,7 +262,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>
 {
@@ -379,7 +388,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)?; })
             )?;
@@ -416,43 +425,57 @@ 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
-      );
-
-      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 all_clients = Arc::new(all_clients);
 
-    for addr in &global.addrs {
-      let all_clients_ = all_clients.clone();
+    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(
         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)