new max_batch_down protocol, define

[hippotat.git] / README.config

diff --git a/README.config b/README.config
index f6054da5b3ef2a78c123c181dae3ecc7f9eb738f..a2b9d7d31d70b79c77b116c3c9b27cf2aa771db9 100644 (file)
--- a/README.config
+++ b/README.config
@@ -6,11 +6,16 @@ Sections
   [<client>]
   [<servername>]      often [SERVER]
   [COMMON]
-  [DEFAULT]
 
 Keys are looked up in that order, unless otherwise specified.
 <client> is the client's virtual address.
-<servername> must be a valid DNS hostname and not look like an address.
+<servername> must be a valid lowercase DNS hostname and not look like 
+an address, or be COMMON, DEFAULT or SERVER.
+
+There are also:
+
+  [<servername> LIMIT]
+  [LIMIT]
 
 Things not in a section are an error.
 
@@ -65,11 +70,14 @@ Exceptional settings:
   ipif
      Command to run to create and communicate with local network
      interface.  Passed to sh -c.  Must speak SLIP on stdin/stdout.
-     The following additional interpolations aare substituted:
-                       %(local)s  %(peer)s  %(rnet)s    %(ifname)s
+     The following interpolations aare substituted:
+                       %{local}   %{peer}   %{rnets}    %{ifname}
           on server    <vaddr>    <vrelay>  <vnetwork>  <ifname_server>
           on client    <client>   <vaddr>   <vroutes>   <ifname_client>
-     ["userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s"]
+     Plus %{mtu} and %% to indicate a literal %.
+     (For compatibility with older hippotat, %(var)s is supported too
+     but this is deprecated since the extra `s` is confusing.)
+     ["userv root ipif %{local},%{peer},%{mtu},slip '%{rnets}'"]
 
      On server: applies to all clients; not looked up in
       client-specific sections.
@@ -81,7 +89,11 @@ Capped settings:
      those from the other sections (including COMMON).
 
   max_batch_down
-     Size limit for response payloads (used by server only)
+     Size limit for response payloads.
+     On client, incoming response bodies are limited to this plus
+     a fixed constant metadata overhead of 10000 bytes.
+     Server uses minim of client and server value (old servers
+     just uses server's value).
      [65536 bytes; LIMIT: 262144 bytes]
 
   max_queue_time
@@ -99,7 +111,7 @@ Capped settings:
      On client: give up on any http request outstanding for
       for this long plus http_timeout_grace
      Client's effective timeout must be at least server's (checked).
-     [30 s; LIMIT: 121]
+     [30 s; LIMIT: 121s]
 
   target_requests_outstanding   
      On server: whenever number of outstanding requests for
@@ -125,6 +137,7 @@ Ordinary settings, used by both, not client-specific:
 
   vaddr
      Address of server's virtual interface.
+     [first host entry in <vnetwork>, so 172.24.230.193]
 
   vrelay
      Virtual point-to-point address used for tunnel routing
@@ -138,7 +151,8 @@ Ordinary settings, used by both, not client-specific:
      On client: used only to construct default url.
 
   mtu
-     Must match exactly.  (UNCHECKED) [1500 bytes]
+     Of virtual interface.  Must match exactly at each end.
+     (UNCHECKED) [1500 bytes]
 
   ifname_server
      Virtual interface name on the server.  [shippo%d]