From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 2 Aug 2021 00:51:58 +0000 (+0100)
Subject: tidy up errors
X-Git-Tag: hippotat/1.0.0~383
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ae3302f041d00fa51838b428ae784f4267cdb13a;p=hippotat.git

tidy up errors

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

diff --git a/src/bin/client.rs b/src/bin/client.rs
index 4d49519..080ced9 100644
--- a/src/bin/client.rs
+++ b/src/bin/client.rs
@@ -199,10 +199,12 @@ async fn run_client<C:HCC>(
           packets = check
             ::<_,_,true>(ic.mtu, &data, |header| {
               let addr = ip_packet_addr::<false>(header)?;
-              if addr != ic.link.client.0 { throw!(PE::UnexpectedSrc(addr)) }
+              if addr != ic.link.client.0 { throw!(PE::Src(addr)) }
               Ok(())
             }, |e| match e {
-              e => error!("PACKET ERROR {}", e), // xxx
+              PE::Empty => { },
+              e@ PE::Src(_) => debug!("{}: tx: discarding: {}", &ic, e),
+              e => error!("{}: tx: discarding: {}", &ic, e),
             }).into();
         },
 
diff --git a/src/slip.rs b/src/slip.rs
index 5e64d8e..c5b919b 100644
--- a/src/slip.rs
+++ b/src/slip.rs
@@ -11,8 +11,8 @@ pub enum PacketError {
   #[error("empty packet")]                 Empty,
   #[error("MTU exceeded ({len} > {mtu})")] MTU { len: usize, mtu: u32 },
   #[error("Invalid SLIP escape sequence")] SLIP,
-  #[error("unexpected src addr {0:?}")]    UnexpectedSrc(IpAddr),
-  #[error("unexpected dst addr {0:?}")]    UnexpectedDst(IpAddr),
+  #[error("unexpected src addr {0:?}")]    Src(IpAddr),
+  #[error("unexpected dst addr {0:?}")]    Dst(IpAddr),
   #[error("bad, IPv{vsn}, len={len}")]     Bad { len: usize, vsn: u8 },
 }