From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 25 Jul 2021 18:27:56 +0000 (+0100)
Subject: config: No longer substitute ifname_*; (more) breaking change
X-Git-Tag: hippotat/1.0.0~443
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=7ba4c310ef43a07d70d47eaa98147204dba4e242;p=hippotat.git

config: No longer substitute ifname_*; (more) breaking change

The docs didn't mention this.  Technically it's a breaking change that
unlike in Python, stuff doesn't gets substituted willy nilly into
every variable from every other variable.  Here we just delete (again)
the code to specially do this for ifname_client and ifname_server.

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

diff --git a/src/config.rs b/src/config.rs
index 174b568..c38b580 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -54,8 +54,8 @@ max_batch_up = 4000
 http_retry = 5
 port = 80
 vroutes = ''
-ifname_client = hippo%%d
-ifname_server = shippo%%d
+ifname_client = hippo%d
+ifname_server = shippo%d
 max_clock_skew = 300
 
 ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip,%(ifname)s '%(rnets)s'
@@ -713,14 +713,6 @@ impl InstanceConfig {
       }
     }
 
-    let ifname = match match end {
-      LinkEnd::Client => (&mut self.ifname_client, "ifname_client"),
-      LinkEnd::Server => (&mut self.ifname_server, "ifname_server"),
-    } { (var,name) => {
-      subst(var, &mut iter::empty()).context(name).context("interface name")?;
-      var
-    } };
-
     {
       use LinkEnd::*;
       type DD<'d> = &'d dyn Display;