config: Tidy defaults and move some info to README.config

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

diff --git a/README.config b/README.config
index 4afc45ae1960747111c661eec29b35d6cf5d3030..a6db64ee578112bb670a0c2bd0d862e5d0feb9b3 100644 (file)
--- a/README.config
+++ b/README.config
@@ -143,7 +143,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]

diff --git a/src/config.rs b/src/config.rs
index b9cb74420011053652e69fab6093e010539ec90f..2d45bd4fde3f705c19693520d947a3fa0194780d 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -22,24 +22,11 @@ ifname_client = hippo%%d
 ifname_server = shippo%%d
 max_clock_skew = 300
 
-#[server] or [<client>] overrides
 ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip,%(ifname)s %(rnets)s
 
-# relating to virtual network
 mtu = 1500
 
-# addrs = 127.0.0.1 ::1
-# url
-
-# relating to virtual network
 vvnetwork = 172.24.230.192
-# vnetwork = <prefix>/<len>
-# vaddr    = <ipaddr>
-# vrelay   = <ipaddr>
-
-
-# [<client-ip4-or-ipv6-address>]
-# secret = <secret>    # used by both, must match
 
 [LIMIT]
 max_batch_down = 262144