make route_packet async

[hippotat.git] / src / slip.rs

diff --git a/src/slip.rs b/src/slip.rs
index 955c36f624dddd027e0798fe2e7c04947af1d480..f5980cc3b72f5d559f8170fc7bd50cce503ea57a 100644 (file)
--- a/src/slip.rs
+++ b/src/slip.rs
@@ -24,41 +24,44 @@ impl SlipMime for Slip2Mime { const CONV_TO: Option<bool> = Some(true); }
 impl SlipMime for Mime2Slip { const CONV_TO: Option<bool> = Some(false); }
 impl SlipMime for SlipNoConv { const CONV_TO: Option<bool> = None; }
 
-#[derive(Debug)]
-#[derive(Error)]
-#[error("only bad IP datagrams")]
-pub struct ErrorOnlyBad;
-
-#[throws(ErrorOnlyBad)]
-pub fn checkn<AC, EH, OUT, ACR, M: SlipMime+Copy>(
+#[derive(Debug,Error)]
+pub enum SlipFramesError<E> where E: std::error::Error + 'static {
+  #[error("only bad IP datagrams")] ErrorOnlyBad,
+  #[error("{0}")] Other(#[from] E),
+}
+  
+#[throws(SlipFramesError<EHE>)]
+pub async fn checkn<AC, EH, EHE, OUT, FOUT, ACR, M: SlipMime+Copy>(
   mime: M,
   mtu: u32,
   data: &[u8],
   addr_chk: AC,
   mut out: OUT,
   mut error_handler: EH
-) where AC: Fn(&[u8]) -> Result<ACR, PacketError> + Copy,
-        OUT: FnMut((Box<[u8]>, ACR)) -> Result<(), PacketError>,
-        EH: FnMut(PacketError),
+) where AC: Fn(&[u8]) -> Result<ACR, PacketError> + Copy + Send,
+        OUT: FnMut((Box<[u8]>, ACR)) -> FOUT + Send,
+        FOUT: Future<Output=Result<(), PacketError>> + Send,
+        EH: FnMut(PacketError) -> Result<(), SlipFramesError<EHE>> + Send,
+        EHE: std::error::Error + Send + 'static,
 {
   //  eprintln!("before: {:?}", DumpHex(data));
   if data.is_empty() { return }
   let mut ok = false;
   let mut err = false;
   for packet in data.split(|&c| c == SLIP_END) {
-    match (||{
+    match async {
       let checked = check1(mime, mtu, packet, addr_chk);
       if matches!(checked, Err(PacketError::Empty)) { return Ok::<_,PE>(()) }
-      out(checked?)?;
+      out(checked?).await?;
       ok = true;
       Ok::<_,PE>(())
-    })() {
+    }.await {
       Ok(()) => { },
-      Err(e) => { err=true; error_handler(e); },
+      Err(e) => { err=true; error_handler(e)?; },
     }
   }
 //  eprintln!(" after: {:?}", DumpHex(data));
-  if err && !ok { throw!(ErrorOnlyBad) }
+  if err && !ok { throw!(SlipFramesError::ErrorOnlyBad) }
 }
 
 #[throws(PacketError)]