slip: make checkn out fallible

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bin/client.rs b/src/bin/client.rs
index 14d81ce2a79e4b567a0988c8d1a01d96d43375b9..d114acec37c319df7c980eff666159b50736cf10 100644 (file)
--- a/src/bin/client.rs
+++ b/src/bin/client.rs
@@ -282,7 +282,7 @@ async fn run_client<C:HCC>(
               let addr = ip_packet_addr::<true>(header)?;
               if addr != ic.link.client.0 { throw!(PE::Dst(addr)) }
               Ok(())
-            }, |o| rx_queue.push(o),
+            }, |o| Ok({ rx_queue.push(o) }),
                |e| error!("{} #{}: rx discarding: {}", &ic, req_num, e))
             {
               Ok(()) => reporter.lock().success(),

diff --git a/src/slip.rs b/src/slip.rs
index 3903636602f0166b32ba05d7ece8977963f757fd..a38239254df59350d42a8691e4cd33ffbe2453cb 100644 (file)
--- a/src/slip.rs
+++ b/src/slip.rs
@@ -36,7 +36,7 @@ pub fn checkn<AC, EH, OUT, M: SlipMime+Copy>(
   mut out: OUT,
   mut error_handler: EH
 ) where AC: Fn(&[u8]) -> Result<(), PacketError> + Copy,
-        OUT: FnMut(Box<[u8]>),
+        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(packet); },
     }
   }
 //  eprintln!(" after: {:?}", DumpHex(data));