slip: make checkn out fallible

[hippotat.git] / src / slip.rs

diff --git a/src/slip.rs b/src/slip.rs
index 0b1fe6c93574e6de350fa2e99184fd24ad494d06..a38239254df59350d42a8691e4cd33ffbe2453cb 100644 (file)
--- a/src/slip.rs
+++ b/src/slip.rs
@@ -32,11 +32,11 @@ pub fn checkn<AC, EH, OUT, M: SlipMime+Copy>(
   mime: M,
   mtu: u32,
   data: &[u8],
-  out: &mut OUT,
   addr_chk: AC,
+  mut out: OUT,
   mut error_handler: EH
-) where OUT: Extend<Box<[u8]>>,
-        AC: Fn(&[u8]) -> Result<(), PacketError> + Copy,
+) where AC: Fn(&[u8]) -> Result<(), PacketError> + Copy,
+        OUT: FnMut(Box<[u8]>) -> Result<(), PacketError>,
         EH: FnMut(PacketError),
 {
   //  eprintln!("before: {:?}", DumpHex(data));
@@ -44,10 +44,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 packet = check1(mime, mtu, packet, addr_chk);
+      if matches!(packet, Err(PacketError::Empty)) { return Ok::<_,PE>(()) }
+      out(packet?)?;
+      ok = true;
+      Ok::<_,PE>(())
+    })() {
+      Ok(()) => { },
       Err(e) => { err=true; error_handler(e); },
-      Ok(packet) => { ok=true; out.extend(iter::once(packet)); },
     }
   }
 //  eprintln!(" after: {:?}", DumpHex(data));