From 95ff555cd7c268d6b0ff898743fabc63e73090c7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Aug 2021 15:48:28 +0100
Subject: [PATCH 1/1] slip: reamee processn and process1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 client/client.rs | 4 ++--
 server/slocal.rs | 3 ++-
 server/suser.rs  | 2 +-
 src/prelude.rs   | 2 +-
 src/slip.rs      | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/client.rs b/client/client.rs
index 8e58c7c..e3548d4 100644
--- a/client/client.rs
+++ b/client/client.rs
@@ -227,7 +227,7 @@ async fn run_client<C:HCC>(
           let data = data?;
           //eprintln!("data={:?}", DumpHex(&data));
 
-          match check1(Slip2Mime, ic.mtu, &data, |header| {
+          match slip::process1(Slip2Mime, ic.mtu, &data, |header| {
             let saddr = ip_packet_addr::<false>(header)?;
             if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
             Ok(())
@@ -276,7 +276,7 @@ async fn run_client<C:HCC>(
           if let Some(got) = got {
             
             //eprintln!("got={:?}", DumpHex(&got));
-            match checkn(SlipNoConv,ic.mtu, &got, |header| {
+            match slip::processn(SlipNoConv,ic.mtu, &got, |header| {
               let addr = ip_packet_addr::<true>(header)?;
               if addr != ic.link.client.0 { throw!(PE::Dst(addr)) }
               Ok(())
diff --git a/server/slocal.rs b/server/slocal.rs
index a30aad6..152a570 100644
--- a/server/slocal.rs
+++ b/server/slocal.rs
@@ -35,7 +35,8 @@ pub async fn run(global: Arc<Global>,
 
           goodness -= goodness >> GOODNESS_SHIFT;
 
-          match checkn(SlipNoConv, global.config.mtu, &data, |header|{
+          // xxx should be process1
+          match slip::processn(SlipNoConv, global.config.mtu, &data, |header|{
             let saddr = ip_packet_addr::<false>(header)?;
             let daddr = ip_packet_addr::<true>(header)?;
             Ok((saddr,daddr))
diff --git a/server/suser.rs b/server/suser.rs
index 798c5bc..dd580b6 100644
--- a/server/suser.rs
+++ b/server/suser.rs
@@ -138,7 +138,7 @@ pub async fn run(global: Arc<Global>,
             if comp.name != PartName::d {
               warnings.add(&format_args!("unexpected part {:?}", comp.name))?;
             }
-            checkn(Mime2Slip, mtu, comp.payload, |header| {
+            slip::processn(Mime2Slip, mtu, comp.payload, |header| {
               let saddr = ip_packet_addr::<false>(header)?;
               if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
               let daddr = ip_packet_addr::<true>(header)?;
diff --git a/src/prelude.rs b/src/prelude.rs
index 10b3953..228509b 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -62,7 +62,7 @@ pub use crate::utils::*;
 pub use crate::queue::*;
 pub use crate::reporter::*;
 pub use crate::types::*;
-pub use crate::slip::*;
+pub use crate::slip::{self, *};
 
 pub type ReqNum = u64;
 
diff --git a/src/slip.rs b/src/slip.rs
index fbbbf3d..a2beaf0 100644
--- a/src/slip.rs
+++ b/src/slip.rs
@@ -31,7 +31,7 @@ pub enum SlipFramesError<E> where E: std::error::Error + 'static {
 }
   
 #[throws(SlipFramesError<EHE>)]
-pub async fn checkn<AC, EH, EHE, OUT, FOUT, ACR, M: SlipMime+Copy>(
+pub async fn processn<AC, EH, EHE, OUT, FOUT, ACR, M: SlipMime+Copy>(
   mime: M,
   mtu: u32,
   data: &[u8],
@@ -50,7 +50,7 @@ pub async fn checkn<AC, EH, EHE, OUT, FOUT, ACR, M: SlipMime+Copy>(
   let mut err = false;
   for packet in data.split(|&c| c == SLIP_END) {
     match async {
-      let checked = check1(mime, mtu, packet, addr_chk);
+      let checked = process1(mime, mtu, packet, addr_chk);
       if matches!(checked, Err(PacketError::Empty)) { return Ok::<_,PE>(()) }
       out(checked?).await?;
       ok = true;
@@ -65,7 +65,7 @@ pub async fn checkn<AC, EH, EHE, OUT, FOUT, ACR, M: SlipMime+Copy>(
 }
 
 #[throws(PacketError)]
-pub fn check1<AC, M: SlipMime, ACR>(
+pub fn process1<AC, M: SlipMime, ACR>(
   _mime: M,
   mtu: u32,
   packet: &[u8],
-- 
2.30.2