rename methods etc.

[hippotat.git] / client / client.rs

diff --git a/client/client.rs b/client/client.rs
index 8e58c7c2a5f9dad9d6c943083b8aa2a69372ec42..887645d0fbca2b3a593696272863af22e440926a 100644 (file)
--- a/client/client.rs
+++ b/client/client.rs
@@ -192,7 +192,7 @@ async fn run_client<C:HCC>(
   let mut reqs: Vec<OutstandingRequest>
     = Vec::with_capacity(ic.max_requests_outstanding.sat());
 
-  let mut rx_queue: FrameQueue = default();
+  let mut rx_queue: FrameQueueBuf = default();
 
   let trouble = async {
     loop {
@@ -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,12 +276,12 @@ 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(())
             },
-            |(o,())| future::ready(Ok({ rx_queue.push(o); })),
+            |(o,())| future::ready(Ok({ rx_queue.push_esc(o); })),
             |e| Ok::<_,SlipFramesError<Void>>( {
               error!("{} #{}: rx discarding: {}", &ic, req_num, e);
             })).await