mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf: --config-net option is for pasta mode only

Browse source 
Reported-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2023-05-14 14:14:29 +02:00
parent 2fe0461856
commit 468f19a852
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
conf.c
View file

@ -1184,7 +1184,6 @@ void conf(struct ctx *c, int argc, char **argv)
{"userns", required_argument, NULL, 2 }, {"userns", required_argument, NULL, 2 },
{"netns", required_argument, NULL, 3 }, {"netns", required_argument, NULL, 3 },
{"netns-only", no_argument, &netns_only, 1 }, {"netns-only", no_argument, &netns_only, 1 },
{"config-net", no_argument, &c->pasta_conf_ns, 1 },
{"ns-mac-addr", required_argument, NULL, 4 }, {"ns-mac-addr", required_argument, NULL, 4 },
{"dhcp-dns", no_argument, NULL, 5 }, {"dhcp-dns", no_argument, NULL, 5 },
{"no-dhcp-dns", no_argument, NULL, 6 }, {"no-dhcp-dns", no_argument, NULL, 6 },
@ -1198,6 +1197,7 @@ void conf(struct ctx *c, int argc, char **argv)
{"version", no_argument, NULL, 14 }, {"version", no_argument, NULL, 14 },
{"outbound-if4", required_argument, NULL, 15 }, {"outbound-if4", required_argument, NULL, 15 },
{"outbound-if6", required_argument, NULL, 16 }, {"outbound-if6", required_argument, NULL, 16 },
{"config-net", no_argument, NULL, 17 },
{ 0 }, { 0 },
}; };
struct get_bound_ports_ns_arg ns_ports_arg = { .c = c }; struct get_bound_ports_ns_arg ns_ports_arg = { .c = c };
@ -1355,6 +1355,12 @@ void conf(struct ctx *c, int argc, char **argv)
if (ret <= 0 || ret >= (int)sizeof(c->ip6.ifname_out)) if (ret <= 0 || ret >= (int)sizeof(c->ip6.ifname_out))
die("Invalid interface name: %s", optarg); die("Invalid interface name: %s", optarg);
break;
case 17:
if (c->mode != MODE_PASTA)
die("--config-net is for pasta mode only");
c->pasta_conf_ns = 1;
break; break;
case 'd': case 'd':
if (c->debug) if (c->debug)