server: change type of checkn

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

diff --git a/src/bin/client.rs b/src/bin/client.rs
index 559b1afcb616111cedfe53d7032fdaa38b043826..d73eceb221277819c858df45c602171d7d6b12aa 100644 (file)
--- a/src/bin/client.rs
+++ b/src/bin/client.rs
@@ -276,11 +276,13 @@ async fn run_client<C:HCC>(
           if let Some(got) = got {
             
             //eprintln!("got={:?}", DumpHex(&got));
-            match checkn(SlipNoConv,ic.mtu, &got, &mut rx_queue, |header| {
+            match checkn(SlipNoConv,ic.mtu, &got, |header| {
               let addr = ip_packet_addr::<true>(header)?;
               if addr != ic.link.client.0 { throw!(PE::Dst(addr)) }
               Ok(())
-            }, |e| error!("{} #{}: rx discarding: {}", &ic, req_num, e)) {
+            }, |o| rx_queue.push(o),
+               |e| error!("{} #{}: rx discarding: {}", &ic, req_num, e))
+            {
               Ok(()) => reporter.lock().success(),
               Err(ErrorOnlyBad) => {
                 reqs.push(Box::pin(async {

diff --git a/src/slip.rs b/src/slip.rs
index 0b1fe6c93574e6de350fa2e99184fd24ad494d06..3903636602f0166b32ba05d7ece8977963f757fd 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]>),
         EH: FnMut(PacketError),
 {
   //  eprintln!("before: {:?}", DumpHex(data));
@@ -47,7 +47,7 @@ pub fn checkn<AC, EH, OUT, M: SlipMime+Copy>(
     match check1(mime, mtu, packet, addr_chk) {
       Err(PacketError::Empty) => { }
       Err(e) => { err=true; error_handler(e); },
-      Ok(packet) => { ok=true; out.extend(iter::once(packet)); },
+      Ok(packet) => { ok=true; out(packet); },
     }
   }
 //  eprintln!(" after: {:?}", DumpHex(data));