public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
* [PATCH] conf: Make -a/--address really imply --no-copy-addrs
@ 2023-06-22 22:43 Stefano Brivio
  0 siblings, 0 replies; only message in thread
From: Stefano Brivio @ 2023-06-22 22:43 UTC (permalink / raw)
  To: passt-dev; +Cc: Paul Holzinger, David Gibson

I wrote it in commit message and man page, but not in conf()...

Note that -g/--gateway correctly implies --no-copy-routes already.

This fixes Podman's tests:

  podman networking with pasta(1) - IPv4 address assignment
  podman networking with pasta(1) - IPv4 default route assignment

where we pass -a and -g to assign an address and a default gateway
that's compatible with it, but -a doesn't disable the copy of
addresses, so we ignore -a, and the default gateway is incompatible
with the addresses we copy -- hence no routes in the container.

Link: https://github.com/containers/podman/pull/18612
Fixes: cc9d16758be6 ("conf, pasta: With --config-net, copy all addresses by default")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 conf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf.c b/conf.c
index db9d095..16a3e64 100644
--- a/conf.c
+++ b/conf.c
@@ -1502,6 +1502,9 @@ void conf(struct ctx *c, int argc, char **argv)
 
 			break;
 		case 'a':
+			if (c->mode == MODE_PASTA)
+				c->no_copy_addrs = 1;
+
 			if (IN6_IS_ADDR_UNSPECIFIED(&c->ip6.addr)	&&
 			    inet_pton(AF_INET6, optarg, &c->ip6.addr)	&&
 			    !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.addr)	&&
-- 
@@ -1502,6 +1502,9 @@ void conf(struct ctx *c, int argc, char **argv)
 
 			break;
 		case 'a':
+			if (c->mode == MODE_PASTA)
+				c->no_copy_addrs = 1;
+
 			if (IN6_IS_ADDR_UNSPECIFIED(&c->ip6.addr)	&&
 			    inet_pton(AF_INET6, optarg, &c->ip6.addr)	&&
 			    !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.addr)	&&
-- 
2.39.2


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2023-06-22 22:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-22 22:43 [PATCH] conf: Make -a/--address really imply --no-copy-addrs Stefano Brivio

Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).