From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id AF20C5A0271; Fri, 23 Jun 2023 10:14:37 +0200 (CEST) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH] conf: Accept -a and -g without --config-net in pasta mode Date: Fri, 23 Jun 2023 10:14:37 +0200 Message-Id: <20230623081437.2065482-1-sbrivio@redhat.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: AEP5WBD6UFTCCXAGK6AHXE2JAKZQWLY2 X-Message-ID-Hash: AEP5WBD6UFTCCXAGK6AHXE2JAKZQWLY2 X-MailFrom: sbrivio@passt.top X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Gianluca Stivan , David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 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 --- This is based on my previous patch: "conf: Make -a/--address really imply --no-copy-addrs" conf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/conf.c b/conf.c index 16a3e64..820d597 100644 --- a/conf.c +++ b/conf.c @@ -1197,6 +1197,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; @@ -1362,14 +1363,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 20: if (logfile) @@ -1682,10 +1683,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) -- 2.39.2