From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Aug 2021 14:37:55 +0000 (+0100)
Subject: refactor body limit, for reuse in server, rename MAX_OVERHEAD
X-Git-Tag: hippotat/1.0.0~215
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5b83fe008f99684261eda887e77d9fdde85b0db5;p=hippotat.git

refactor body limit, for reuse in server, rename MAX_OVERHEAD

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

diff --git a/src/bin/client.rs b/src/bin/client.rs
index 29b6ef9..1f382bb 100644
--- 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)]
@@ -143,7 +141,7 @@ fn submit_request<'r, 'c:'r, C:HCC>(
       let resp = resp.await.context("make request")?;
       let status = resp.status();
       let mut resp = resp.into_body();
-      let max_body = c.ic.max_batch_down.sat() + MAX_BATCH_DOWN_RESP_OVERHEAD;
+      let max_body = c.ic.max_batch_down.sat() + MAX_OVERHEAD;
       let resp = read_limited_bytes(max_body, &mut resp).await
         .context("fetching response body")?;
 
diff --git a/src/prelude.rs b/src/prelude.rs
index ceb57d1..0d53dbe 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -73,6 +73,8 @@ pub const SLIP_ESC_END: u8 = 0o334; // dc
 pub const SLIP_ESC_ESC: u8 = 0o335; // dd
 pub const SLIP_MIME_ESC: u8 = b'-'; // 2d
 
+pub const MAX_OVERHEAD: usize = 2_000;
+
 pub use base64::STANDARD as BASE64_CONFIG;
 
 pub fn default<T:Default>() -> T { Default::default() }