slip: reamee processn and process1

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

diff --git a/client/client.rs b/client/client.rs
index 8e58c7c2a5f9dad9d6c943083b8aa2a69372ec42..e3548d4ddd949218094c1d6b23f75005b8d0932a 100644 (file)
--- 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 a30aad6a61e76c2b6b877a5340cf7b693b47b969..152a570f16d12098486784869aad2f17242e03ee 100644 (file)
--- 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 798c5bcb28d16f3f3331d62b094a948b5b082d19..dd580b6ebe09368a09d705e8b2fa67c9b07e3907 100644 (file)
--- 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 10b39538f2a106e93a558757855da07a48c069d5..228509bbbaf6100f02575a976af6c468f4e590bf 100644 (file)
--- 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 fbbbf3dece7317a5f547f0b7c60f5dbdf888656a..a2beaf0de33b85c32e480e2c55db30c1dc50a4e6 100644 (file)
--- 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],