server: wip recv

[hippotat.git] / src / slip.rs

diff --git a/src/slip.rs b/src/slip.rs
index 3903636602f0166b32ba05d7ece8977963f757fd..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]>),
+) where AC: Fn(&[u8]) -> Result<ACR, PacketError> + Copy,
+        OUT: FnMut((Box<[u8]>, ACR)) -> Result<(), PacketError>,
         EH: FnMut(PacketError),
 {
   //  eprintln!("before: {:?}", DumpHex(data));
@@ -44,10 +46,15 @@ pub fn checkn<AC, EH, OUT, M: SlipMime+Copy>(
   let mut ok = false;
   let mut err = false;
   for packet in data.split(|&c| c == SLIP_END) {
-    match check1(mime, mtu, packet, addr_chk) {
-      Err(PacketError::Empty) => { }
+    match (||{
+      let checked = check1(mime, mtu, packet, addr_chk);
+      if matches!(checked, Err(PacketError::Empty)) { return Ok::<_,PE>(()) }
+      out(checked?)?;
+      ok = true;
+      Ok::<_,PE>(())
+    })() {
+      Ok(()) => { },
       Err(e) => { err=true; error_handler(e); },
-      Ok(packet) => { ok=true; out(packet); },
     }
   }
 //  eprintln!(" after: {:?}", DumpHex(data));
@@ -55,13 +62,13 @@ pub fn checkn<AC, EH, OUT, M: SlipMime+Copy>(
 }
 
 #[throws(PacketError)]
-pub fn check1<AC, M: SlipMime>(
+pub fn check1<AC, M: SlipMime, ACR>(
   _mime: M,
   mtu: u32,
   packet: &[u8],
   addr_chk: AC,
-) -> Box<[u8]>
-where AC: Fn(&[u8]) -> Result<(), PacketError>,
+) -> (Box<[u8]>, ACR)
+where AC: Fn(&[u8]) -> Result<ACR, PacketError>,
 {
   if packet.len() == 0 {
     throw!(PacketError::Empty)
@@ -107,9 +114,9 @@ where AC: Fn(&[u8]) -> Result<(), PacketError>,
     throw!(PacketError::MTU { len: decoded_len, mtu });
   }
 
-  addr_chk(&header)?;
+  let acr = addr_chk(&header)?;
 
-  packet
+  (packet, acr)
 }
 
 pub type Frame = Vec<u8>;