sort out error handling for server rx slip frames

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

diff --git a/src/bin/client.rs b/src/bin/client.rs
index 10b207698e5c005e90afc7a3caa1d1a218e7c9c3..cfb632e8ce359ed2d89d643854e52aa2c0258fe2 100644 (file)
--- a/src/bin/client.rs
+++ b/src/bin/client.rs
@@ -282,16 +282,20 @@ 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,())| Ok({ rx_queue.push(o); }),
-               |e| error!("{} #{}: rx discarding: {}", &ic, req_num, e))
+            },
+            |(o,())| Ok({ rx_queue.push(o); }),
+            |e| Ok::<_,SlipFramesError<Void>>( {
+              error!("{} #{}: rx discarding: {}", &ic, req_num, e);
+            }))
             {
               Ok(()) => reporter.lock().success(),
-              Err(ErrorOnlyBad) => {
+              Err(SlipFramesError::ErrorOnlyBad) => {
                 reqs.push(Box::pin(async {
                   tokio::time::sleep(ic.http_retry).await;
                   None
                 }));
               },
+              Err(SlipFramesError::Other(v)) => unreachable!(v),
             }
           }
         },

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 4a8070481f77e815a776f20863152265b9120adb..73f2de5495639841d3525e59bf39767a6aa7efae 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -349,7 +349,7 @@ async fn run_client(ic: Arc<InstanceConfig>,
               let daddr = ip_packet_addr::<true>(header)?;
               Ok(daddr)
             }, |(daddr,packet)| route_packet(daddr,packet),
-               |e| { let _xxx = warnings.add(&e); }
+               |e| Ok::<_,SlipFramesError<_>>({ warnings.add(&e)?; })
             )?;
           }
 

diff --git a/src/slip.rs b/src/slip.rs
index 955c36f624dddd027e0798fe2e7c04947af1d480..6bb508bf2cfe25894aa00dcc3f27c5dfcaa4472d 100644 (file)
--- a/src/slip.rs
+++ b/src/slip.rs
@@ -24,13 +24,14 @@ impl SlipMime for Slip2Mime { const CONV_TO: Option<bool> = Some(true); }
 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, ACR, M: SlipMime+Copy>(
+#[derive(Debug,Error)]
+pub enum SlipFramesError<E> where E: std::error::Error + 'static {
+  #[error("only bad IP datagrams")] ErrorOnlyBad,
+  #[error("{0}")] Other(#[from] E),
+}
+  
+#[throws(SlipFramesError<EHE>)]
+pub fn checkn<AC, EH, EHE, OUT, ACR, M: SlipMime+Copy>(
   mime: M,
   mtu: u32,
   data: &[u8],
@@ -39,7 +40,8 @@ pub fn checkn<AC, EH, OUT, ACR, M: SlipMime+Copy>(
   mut error_handler: EH
 ) where AC: Fn(&[u8]) -> Result<ACR, PacketError> + Copy,
         OUT: FnMut((Box<[u8]>, ACR)) -> Result<(), PacketError>,
-        EH: FnMut(PacketError),
+        EH: FnMut(PacketError) -> Result<(), SlipFramesError<EHE>>,
+        EHE: std::error::Error + 'static,
 {
   //  eprintln!("before: {:?}", DumpHex(data));
   if data.is_empty() { return }
@@ -54,11 +56,11 @@ pub fn checkn<AC, EH, OUT, ACR, M: SlipMime+Copy>(
       Ok::<_,PE>(())
     })() {
       Ok(()) => { },
-      Err(e) => { err=true; error_handler(e); },
+      Err(e) => { err=true; error_handler(e)?; },
     }
   }
 //  eprintln!(" after: {:?}", DumpHex(data));
-  if err && !ok { throw!(ErrorOnlyBad) }
+  if err && !ok { throw!(SlipFramesError::ErrorOnlyBad) }
 }
 
 #[throws(PacketError)]