public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Jon Maloy <jmaloy@redhat.com>
To: sbrivio@redhat.com, david@gibson.dropbear.id.au,
	jmaloy@redhat.com, passt-dev@passt.top
Subject: [PATCH v9 4/5] conf: Allow multiple -a/--address options per address family
Date: Fri, 20 Nov 2026 14:24:36 -0500	[thread overview]
Message-ID: <20261120192437.1860855-5-jmaloy@redhat.com> (raw)
In-Reply-To: <20261120192437.1860855-1-jmaloy@redhat.com>

Allow specifying multiple addresses per family with -a/--address.
The first address of each family is used for DHCP/DHCPv6 assignment.

Link: https://bugs.passt.top/show_bug.cgi?id=47
Cc: lemmi@nerd2nerd.org
Signed-off-by: Jon Maloy <jmaloy@redhat.com>

---
v2: - Adapted to previous code changes
v3: - Adapted to single-array strategy
    - Changes according to feedback from S. Brivio and G Gibson.
v4: - Stripped down and adapted after feedback from David G.
v6: - Adapted to previous changes in series
    - Removed the "one address" limitation for -n option
v7: - Updated man page.
v8: - Adapted to previous changes in this series
    - Updated according to comments from David G.
v9: - Adapted to previous changes in this series
---
 conf.c  |  6 ++++--
 fwd.c   |  9 +++++----
 passt.1 | 18 ++++++++----------
 pasta.c | 27 +++++++++++++++------------
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/conf.c b/conf.c
index 27656271..f0a87d8f 100644
--- a/conf.c
+++ b/conf.c
@@ -628,9 +628,11 @@ static void usage(const char *name, FILE *f, int status)
 		"    default: 65520: maximum 802.3 MTU minus 802.3 header\n"
 		"                    length, rounded to 32 bits (IPv4 words)\n"
 		"  -a, --address ADDR	Assign IPv4 or IPv6 address ADDR[/PREFIXLEN]\n"
-		"    can be specified zero to two times (for IPv4 and IPv6)\n"
+		"    can be specified up to a maximum of %d times\n"
 		"    default: use addresses from interface with default route\n"
-		"  -n, --netmask MASK	Assign IPv4 MASK, dot-decimal or bits\n"
+		"  -n, --netmask MASK	Assign IPv4 MASK, dot-decimal or bits\n",
+		MAX_GUEST_ADDRS);
+	FPRINTF(f,
 		"    default: netmask from matching address on the host\n"
 		"  -M, --mac-addr ADDR	Use source MAC address ADDR\n"
 		"    default: 9a:55:9a:55:9a:55 (locally administered)\n"
diff --git a/fwd.c b/fwd.c
index 5716c9ad..8fbabb29 100644
--- a/fwd.c
+++ b/fwd.c
@@ -250,8 +250,7 @@ void fwd_neigh_table_init(const struct ctx *c)
  * @flags:	CONF_ADDR_* flags for this address
  * @prefix_len:	Prefix length in IPv6 format (96-128 for IPv4-mapped)
  *
- * Find the first existing entry of the same address family and
- * overwrite it, or create a new one if none exists
+ * Update the existing entry for @addr, if any, or append a new one
  */
 void fwd_set_addr(struct ctx *c, const union inany_addr *addr,
 		  uint8_t flags, int prefix_len)
@@ -260,8 +259,10 @@ void fwd_set_addr(struct ctx *c, const union inany_addr *addr,
 
 	assert(flags);
 
-	for_each_addr(a, c->addrs, c->addr_count, inany_af(addr))
-		goto found;
+	for_each_addr(a, c->addrs, c->addr_count, inany_af(addr)) {
+		if (inany_equals(&a->addr, addr))
+			goto found;
+	}
 
 	if (c->addr_count >= MAX_GUEST_ADDRS)
 		return;
diff --git a/passt.1 b/passt.1
index 5d236bdc..cdaaf96a 100644
--- a/passt.1
+++ b/passt.1
@@ -169,16 +169,14 @@ An optional /\fIprefix_len\fR (0-32 for IPv4, 0-128 for IPv6) can be
 appended in CIDR notation (e.g. 192.0.2.1/24). This is an alternative to
 using the \fB-n\fR, \fB--netmask\fR option. Mixing CIDR notation with
 \fB-n\fR results in an error.
-If a prefix length is assigned to an IPv6 address using this method, it will
-in the current code version be overridden by the default value of 64.
-This option can be specified zero (for defaults) to two times (once for IPv4,
-once for IPv6).
-By default, assigned IPv4 and IPv6 addresses are taken from the host interfaces
-with the first default route, if any, for the corresponding IP version. If no
-default routes are available and there is any interface with any route for a
-given IP version, the first of these interfaces will be chosen instead. If no
-such interface exists for a given IP version, the link-local address 169.254.2.1
-is assigned for IPv4, and no additional address will be assigned for IPv6.
+This option can be given multiple times, indicating multiple different
+addresses. By default, assigned IPv4 and IPv6 addresses are taken from
+the host interfaces with the first default route, if any, for the
+corresponding IP version. If no default routes are available and there
+is any interface with any route for a given IP version, the first of
+these interfaces will be chosen instead. If no such interface exists for
+a given IP version, the link-local address 169.254.2.1 is assigned for
+IPv4, and no additional address will be assigned for IPv6.
 
 .TP
 .BR \-n ", " \-\-netmask " " \fImask
diff --git a/pasta.c b/pasta.c
index 4cd58fd7..02bd87e5 100644
--- a/pasta.c
+++ b/pasta.c
@@ -303,6 +303,7 @@ static int pasta_conf_addrs(const struct ctx *c, sa_family_t af, int ifi,
 			    bool no_copy)
 {
 	const struct guest_addr *a;
+	int rc = 0;
 
 	if (!ifi)
 		return 0;
@@ -310,21 +311,23 @@ static int pasta_conf_addrs(const struct ctx *c, sa_family_t af, int ifi,
 	if (!no_copy)
 		return nl_addr_dup(nl_sock, ifi, nl_sock_ns, c->pasta_ifi, af);
 
-	a = fwd_get_addr(c, af, true, CONF_ADDR_ANY);
-	if (!a)
-		return 0;
-
-	if (af == AF_INET) {
-		const struct in_addr *a4;
-		int plen = 0;
+	for_each_addr(a, c->addrs, c->addr_count, af) {
+		if (af == AF_INET) {
+			const struct in_addr *a4;
+			int plen = 0;
 
-		a4 = inany_prefix_v4(&a->addr, a->prefix_len, &plen);
-		return nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET,
-				   a4, plen);
+			a4 = inany_prefix_v4(&a->addr, a->prefix_len, &plen);
+			rc = nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET,
+					 a4, plen);
+		} else {
+			rc = nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET6,
+					 &a->addr.a6, a->prefix_len);
+		}
+		if (rc < 0)
+			break;
 	}
 
-	return nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET6,
-			   &a->addr.a6, a->prefix_len);
+	return rc;
 }
 
 /**
-- 
2.56.1


  parent reply	other threads:[~2026-11-20 19:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 19:24 [PATCH v9 0/5] Introduce multiple addresses Jon Maloy
2026-11-20 19:24 ` [PATCH v9 1/5] tap, conf: Replace addr_fixed with CONF_ADDR_USER flag check Jon Maloy
2026-11-20 19:24 ` [PATCH v9 2/5] fwd: Unify guest accessibility checks with unified address array Jon Maloy
2026-11-20 19:24 ` [PATCH v9 3/5] arp: Check all configured addresses in ARP filtering Jon Maloy
2026-11-20 19:24 ` Jon Maloy [this message]
2026-11-20 19:24 ` [PATCH v9 5/5] netlink, conf: Read all addresses from template interface at startup Jon Maloy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261120192437.1860855-5-jmaloy@redhat.com \
    --to=jmaloy@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).