aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2023-06-23 09:52:36 +0200
committerStefano Brivio <sbrivio@redhat.com>2023-06-25 23:49:25 +0200
commit5b646b9b1051c5aa41e0aeebfd9b6d5be6df614e (patch)
treefa2a2089de1f85f4747e088ccc598d40b8ec379c
parentd034fb698f2312c02642c539881b1c1e965fc8fe (diff)
downloadpasst-5b646b9b1051c5aa41e0aeebfd9b6d5be6df614e.tar
passt-5b646b9b1051c5aa41e0aeebfd9b6d5be6df614e.tar.gz
passt-5b646b9b1051c5aa41e0aeebfd9b6d5be6df614e.tar.bz2
passt-5b646b9b1051c5aa41e0aeebfd9b6d5be6df614e.tar.lz
passt-5b646b9b1051c5aa41e0aeebfd9b6d5be6df614e.tar.xz
passt-5b646b9b1051c5aa41e0aeebfd9b6d5be6df614e.tar.zst
passt-5b646b9b1051c5aa41e0aeebfd9b6d5be6df614e.zip
conf: Accept -a and -g without --config-net in pasta mode
While --no-copy-addrs and --no-copy-routes only make sense with --config-net, and they are implied on -g and -a, respectively, that doesn't mean we should refuse -a or -g without --config-net: they are still relevant for a number of things (including DHCP/DHCPv6/NDP configuration). Reported-by: Gianluca Stivan <me@yawnt.com> Fixes: cc9d16758be6 ("conf, pasta: With --config-net, copy all addresses by default") Fixes: da54641f140e ("conf, pasta: With --config-net, copy all routes by default") Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rw-r--r--conf.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/conf.c b/conf.c
index 2aa0ae3..68487a4 100644
--- a/conf.c
+++ b/conf.c
@@ -1195,6 +1195,7 @@ void conf(struct ctx *c, int argc, char **argv)
};
struct get_bound_ports_ns_arg ns_ports_arg = { .c = c };
char userns[PATH_MAX] = { 0 }, netns[PATH_MAX] = { 0 };
+ bool copy_addrs_opt = false, copy_routes_opt = false;
bool v4_only = false, v6_only = false;
char *runas = NULL, *logfile = NULL;
struct in6_addr *dns6 = c->ip6.dns;
@@ -1360,14 +1361,14 @@ void conf(struct ctx *c, int argc, char **argv)
die("--no-copy-routes is for pasta mode only");
warn("--no-copy-routes will be dropped soon");
- c->no_copy_routes = 1;
+ c->no_copy_routes = copy_routes_opt = true;
break;
case 19:
if (c->mode != MODE_PASTA)
die("--no-copy-addrs is for pasta mode only");
warn("--no-copy-addrs will be dropped soon");
- c->no_copy_addrs = 1;
+ c->no_copy_addrs = copy_addrs_opt = true;
break;
case 'd':
if (c->debug)
@@ -1661,10 +1662,10 @@ void conf(struct ctx *c, int argc, char **argv)
die("Options --socket and --fd are mutually exclusive");
if (c->mode == MODE_PASTA && !c->pasta_conf_ns) {
- if (c->no_copy_routes)
- die("Option --no-copy-routes needs --config-net");
- if (c->no_copy_addrs)
- die("Option --no-copy-addrs needs --config-net");
+ if (copy_routes_opt)
+ die("--no-copy-routes needs --config-net");
+ if (copy_addrs_opt)
+ die("--no-copy-addrs needs --config-net");
}
if (!ifi4 && *c->ip4.ifname_out)