From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Aug 2021 14:09:30 +0000 (+0100)
Subject: max_batch_up: Make it a limit on the server: fixes
X-Git-Tag: hippotat/1.0.0~217
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=1f66a80c18c20c872cbcac28bbd0871639c26682;p=hippotat.git

max_batch_up: Make it a limit on the server: fixes

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

diff --git a/src/config.rs b/src/config.rs
index 93cc168..905d461 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -17,7 +17,7 @@ pub struct InstanceConfig {
   #[limited]    pub max_queue_time:               Duration,
   #[limited]    pub http_timeout:                 Duration,
   #[limited]    pub target_requests_outstanding:  u32,
-  #[special(special_max_up, SKL::PerClient)]  pub max_batch_up: u32,
+  #[special(special_max_up, SKL::Limited)]  pub max_batch_up: u32,
 
   // Ordinary settings, used by both, not client-specifi:
   #[global]  pub addrs:                        Vec<IpAddr>,
@@ -692,9 +692,9 @@ impl<'c> ResolveContext<'c> {
 
   #[throws(AE)]
   pub fn special_max_up(&self, key: &'static str, skl: SKL) -> u32 {
-    assert_eq!(skl, SKL::None);
+    assert_eq!(skl, SKL::Limited);
     match self.end {
-      LinkEnd::Client => self.ordinary(key, SKL::PerClient)?,
+      LinkEnd::Client => self.ordinary(key, SKL::Limited)?,
       LinkEnd::Server => self.ordinary(key, SKL::Limits)?,
     }
   }