client: rename saddr variable

[hippotat.git] / src / bin / client.rs

diff --git a/src/bin/client.rs b/src/bin/client.rs
index b57d7722caa8d443e4e32171fa5350236836e0d7..14d81ce2a79e4b567a0988c8d1a01d96d43375b9 100644 (file)
--- a/src/bin/client.rs
+++ b/src/bin/client.rs
@@ -5,8 +5,6 @@
 use hippotat::prelude::*;
 use hippotat_macros::into_crlfs;
 
-const MAX_BATCH_DOWN_RESP_OVERHEAD: usize = 10_000;
-
 #[derive(StructOpt,Debug)]
 pub struct Opts {
   #[structopt(flatten)]
@@ -47,12 +45,10 @@ fn submit_request<'r, 'c:'r, C:HCC>(
     .saturating_add(Duration::from_nanos(999_999_999))
     .as_secs();
 
-  let time_t = SystemTime::now()
-    .duration_since(UNIX_EPOCH)
-    .unwrap_or_else(|_| Duration::default()) // clock is being weird
-    .as_secs();
+  let time_t = time_t_now();
   let time_t = format!("{:x}", time_t);
   let hmac = token_hmac(c.ic.secret.0.as_bytes(), time_t.as_bytes());
+  //dbg!(DumpHex(&hmac));
   let mut token = time_t;
   write!(token, " ").unwrap();
   base64::encode_config_buf(&hmac, BASE64_CONFIG, &mut token);
@@ -68,12 +64,16 @@ fn submit_request<'r, 'c:'r, C:HCC>(
        {}
        {}
        {}
+       {}
+       {}
        {}"#),
                        &c.ic.link.client,
                        token,
                        c.ic.target_requests_outstanding,
                        show_timeout,
+                       c.ic.mtu,
                        c.ic.max_batch_down,
+                       c.ic.max_batch_up,
   );
 
   let prefix2 = format!(into_crlfs!(
@@ -116,7 +116,7 @@ fn submit_request<'r, 'c:'r, C:HCC>(
     as_ref,
   ).map(|b| b.len()).sum();
 
-  trace!("{} #{}: req; tx bytes={} frames={}",
+  trace!("{} #{}: req; tx body_len={} frames={}",
          &c.ic, req_num, body_len, upbound.len());
 
   let body = hyper::body::Body::wrap_stream(
@@ -140,9 +140,12 @@ fn submit_request<'r, 'c:'r, C:HCC>(
     let r = async { tokio::time::timeout( c.ic.effective_http_timeout, async {
       let resp = resp.await.context("make request")?;
       let status = resp.status();
-      let resp = resp.into_body();
-      let max_body = c.ic.max_batch_down.sat() + MAX_BATCH_DOWN_RESP_OVERHEAD;
-      let resp = read_limited_body(max_body, resp).await?;
+      let mut resp = resp.into_body();
+      let max_body = c.ic.max_batch_down.sat() + MAX_OVERHEAD;
+      let resp = read_limited_bytes(
+        max_body, default(), default(), &mut resp
+      ).await
+        .discard_data().context("fetching response body")?;
 
       if ! status.is_success() {
         throw!(anyhow!("HTTP error status={} body={:?}",
@@ -227,8 +230,8 @@ async fn run_client<C:HCC>(
           //eprintln!("data={:?}", DumpHex(&data));
 
           match check1(Slip2Mime, ic.mtu, &data, |header| {
-            let addr = ip_packet_addr::<false>(header)?;
-            if addr != ic.link.client.0 { throw!(PE::Src(addr)) }
+            let saddr = ip_packet_addr::<false>(header)?;
+            if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
             Ok(())
           }) {
             Ok(data) => tx_queue.push_back(TxQueued {
@@ -275,11 +278,13 @@ async fn run_client<C:HCC>(
           if let Some(got) = got {
             
             //eprintln!("got={:?}", DumpHex(&got));
-            match checkn(SlipNoConv,ic.mtu, &got, &mut rx_queue, |header| {
+            match checkn(SlipNoConv,ic.mtu, &got, |header| {
               let addr = ip_packet_addr::<true>(header)?;
               if addr != ic.link.client.0 { throw!(PE::Dst(addr)) }
               Ok(())
-            }, |e| error!("{} #{}: rx discarding: {}", &ic, req_num, e)) {
+            }, |o| rx_queue.push(o),
+               |e| error!("{} #{}: rx discarding: {}", &ic, req_num, e))
+            {
               Ok(()) => reporter.lock().success(),
               Err(ErrorOnlyBad) => {
                 reqs.push(Box::pin(async {
@@ -309,8 +314,8 @@ async fn run_client<C:HCC>(
 #[tokio::main]
 async fn main() {
   let opts = Opts::from_args();
-  let (ics,()) = config::startup("hippotat", LinkEnd::Client,
-                                 &opts.config, &opts.log, |_|Ok(()));
+  let (ics,) = config::startup("hippotat", LinkEnd::Client,
+                               &opts.config, &opts.log, |ics|Ok((ics,)));
 
   let https = HttpsConnector::new();
   let hclient = hyper::Client::builder()