rename [Frame]QueueBuf

[hippotat.git] / server / suser.rs

diff --git a/server/suser.rs b/server/suser.rs
index d24638471fb884f006338e05ccbd3e7a5f9afca3..28929d9e8afa0c930f843fd5eb0c57eda3f7b147 100644 (file)
--- a/server/suser.rs
+++ b/server/suser.rs
@@ -5,7 +5,7 @@
 use super::*;
 
 #[derive(Debug)]
-pub struct Client {
+pub struct User {
   pub ic: Arc<InstanceConfig>,
   pub web: mpsc::Sender<WebRequest>,
   pub route: mpsc::Sender<RoutedPacket>,
@@ -28,7 +28,7 @@ pub async fn run(global: Arc<Global>,
     target_requests_outstanding: u32,
   }
   let mut outstanding: VecDeque<Outstanding> = default();
-  let  downbound: VecDeque<(/*xxx*/)> = default();
+  let mut downbound: VecDeque<RoutedPacketData> = default();
 
   let try_send_response = |
     reply_to: oneshot::Sender<WebResponse>,
@@ -59,12 +59,17 @@ pub async fn run(global: Arc<Global>,
     }
 
     select!{
+      biased;
+
+      
+      // xxx something something routed something
+
       req = web.recv() =>
       {
         let WebRequest {
           initial, initial_remaining, length_hint, mut body,
           boundary_finder,
-          reply_to, conn, mut warnings,
+          reply_to, conn, mut warnings, may_route,
         } = req.ok_or_else(|| anyhow!("webservers all shut down!"))?;
 
         match async {
@@ -104,27 +109,22 @@ pub async fn run(global: Arc<Global>,
               //dbg!(&$v);
             }
           }
-
           meta!{
             target_requests_outstanding, ( != ), client,
             let server, client: u32 = meta.need_parse()?;
           }
-
           meta!{
             http_timeout, ( > ), client,
             let server, client = Duration::from_secs(meta.need_parse()?);
           }
-
           meta!{
             mtu, ( != ), client,
             let server, client: u32 = meta.parse()?.unwrap_or(server);
           }
-
           meta!{
             max_batch_down, (), min(client, server),
             let server, client: u32 = meta.parse()?.unwrap_or(server);
           }
-
           meta!{
             max_batch_up, ( > ), client,
             let server, client = meta.parse()?.unwrap_or(server);
@@ -134,14 +134,15 @@ pub async fn run(global: Arc<Global>,
             if comp.name != PartName::d {
               warnings.add(&format_args!("unexpected part {:?}", comp.name))?;
             }
-            checkn(Mime2Slip, mtu, comp.payload, |header| {
+            slip::processn(Mime2Slip, mtu, comp.payload, |header| {
               let saddr = ip_packet_addr::<false>(header)?;
               if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
               let daddr = ip_packet_addr::<true>(header)?;
               Ok(daddr)
             }, |(daddr,packet)| route_packet(
-              &global, &conn, &ic.link.client, daddr,packet
-            ),
+              &global, &conn, Some(&ic.link.client), daddr,
+              packet, may_route.clone(),
+            ).map(Ok),
               |e| Ok::<_,SlipFramesError<_>>({ warnings.add(&e)?; })
             ).await?;
           }