server: wip recv

[hippotat.git] / src / slip.rs

diff --git a/src/slip.rs b/src/slip.rs
index 1282bf3bc1c45734d00e4c45e07fab063991b099..955c36f624dddd027e0798fe2e7c04947af1d480 100644 (file)
--- a/src/slip.rs
+++ b/src/slip.rs
@@ -25,18 +25,20 @@ 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, M: SlipMime+Copy>(
+pub fn checkn<AC, EH, OUT, 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<(), PacketError> + Copy,
-        OUT: FnMut(Box<[u8]>) -> Result<(), PacketError>,
+) where AC: Fn(&[u8]) -> Result<ACR, PacketError> + Copy,
+        OUT: FnMut((Box<[u8]>, ACR)) -> Result<(), PacketError>,
         EH: FnMut(PacketError),
 {
   //  eprintln!("before: {:?}", DumpHex(data));
@@ -47,8 +49,7 @@ pub fn checkn<AC, EH, OUT, M: SlipMime+Copy>(
     match (||{
       let checked = check1(mime, mtu, packet, addr_chk);
       if matches!(checked, Err(PacketError::Empty)) { return Ok::<_,PE>(()) }
-      let (packet, _acr) = checked?;
-      out(packet)?;
+      out(checked?)?;
       ok = true;
       Ok::<_,PE>(())
     })() {