From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202602 header.b=az6qOxs8; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 8A0F75A0274 for ; Mon, 25 May 2026 11:47:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1779702437; bh=GqeD3oPj+ruO6mqICzHJFCwgEauDBXV5sgHIIKP9s4A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=az6qOxs8N9tfEpwlTLTjzueL9sYta8C7coG5q9unhSCqiPRVbbLaSDrrAT2gDqLl6 xWPV5ifgOFCQStwbx7jUbxQsm4B125XHgqqNZYZH08fwWWVEk+EJlIBMuLwQF/cIv/ VmKswdnnEr96OIQnsTYtaN2n6WQL8yNe9A5nWu2WFzqtlBDKuKhqgWaNQqVfygw4fH +OI27RraIDqsyetpXSOWi8XCOe+wbNEuXhJkEKIEwGD60kAakMvXU9rcekbcyNxnnv FPK6gY0kBjU61AKMYppYPGB4sl3skrZ5xiZMOcTBtcRUnQFFU7L3tNFMIXnpVL/eN3 Zu+ywkwm3qSbg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4gP9ys3c6Xz4wKB; Mon, 25 May 2026 19:47:17 +1000 (AEST) Date: Mon, 25 May 2026 19:47:13 +1000 From: David Gibson To: Jon Maloy Subject: Re: [PATCH v7 05/13] conf: Allow multiple -a/--address options per address family Message-ID: References: <20260413005319.3295910-1-jmaloy@redhat.com> <20260413005319.3295910-6-jmaloy@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mEL2rvoHmVNBaoRw" Content-Disposition: inline In-Reply-To: <20260413005319.3295910-6-jmaloy@redhat.com> Message-ID-Hash: JZ4BMWRH7Z3NMRHCN5NKM2SDHTPA4VHK X-Message-ID-Hash: JZ4BMWRH7Z3NMRHCN5NKM2SDHTPA4VHK X-MailFrom: dgibson@gandalf.ozlabs.org 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: sbrivio@redhat.com, passt-dev@passt.top 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: --mEL2rvoHmVNBaoRw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 12, 2026 at 08:53:11PM -0400, Jon Maloy wrote: > Allow specifying multiple addresses per family with -a/--address. > The first address of each family is used for DHCP/DHCPv6 assignment. >=20 > Signed-off-by: Jon Maloy >=20 > --- > v2: - Adapted to previous code changes > v3: - Adapted to single-array strategy > - Changes according to feedback from S. Brivio and D. 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. > --- > conf.c | 7 ++++--- > fwd.c | 4 +--- > passt.1 | 7 +++---- > pasta.c | 14 ++++++++------ > 4 files changed, 16 insertions(+), 16 deletions(-) >=20 > diff --git a/conf.c b/conf.c > index 591f561..8b4a7a0 100644 > --- a/conf.c > +++ b/conf.c > @@ -939,9 +939,11 @@ static void usage(const char *name, FILE *f, int sta= tus) > " 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" > @@ -1898,7 +1900,6 @@ void conf(struct ctx *c, int argc, char **argv) > IN6_IS_ADDR_V4COMPAT(&addr.a6)) > die("Invalid address: %s", optarg); > =20 > - /* Legacy behaviour: replace existing address if any */ > fwd_set_addr(c, &addr, CONF_ADDR_USER, prefix_len); > if (inany_v4(&addr)) > c->ip4.no_copy_addrs =3D true; > diff --git a/fwd.c b/fwd.c > index e676c18..d3f576a 100644 > --- a/fwd.c > +++ b/fwd.c > @@ -250,14 +250,12 @@ void fwd_neigh_table_init(const struct ctx *c) > } > =20 > /** > - * fwd_set_addr() - Add or update an address in the unified address array > + * fwd_set_addr() - Update address entry, adding one if needed > * @c: Execution context > * @addr: Address to add (IPv4-mapped or IPv6) > * @flags: CONF_ADDR_* flags for this address > * @prefix_len: Prefix length in IPv6 or IPv4 format > * > - * Find the first existing entry of the same address family and > - * overwrite it, or create a new one if none exists Comment changes imply a change to the function's behaviour, but there's no corresponding change to the code. Did something shift into the wrong patch due to a bad rebase? > */ > void fwd_set_addr(struct ctx *c, const union inany_addr *addr, > uint8_t flags, int prefix_len) > diff --git a/passt.1 b/passt.1 > index 13e8df9..12ec857 100644 > --- a/passt.1 > +++ b/passt.1 > @@ -164,16 +164,13 @@ 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. These two lines don't seem to match what this specific patch does. > -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 int= erfaces > 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 f= or 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= =2E254.2.1 > is assigned for IPv4, and no additional address will be assigned for IPv= 6. > +This option can be given multiple times, indicating multiple different a= ddresses. I'd suggest putting this new text in place of the removed "This option can be specified zero..." text, since it's covering the same detail of the option's behaviour. > .TP > .BR \-n ", " \-\-netmask " " \fImask > @@ -181,6 +178,8 @@ Assign IPv4 netmask \fImask\fR, expressed as dot-deci= mal or number of bits, via > DHCP (option 1). Alternatively, the prefix length can be specified using= CIDR > notation with the \fB-a\fR, \fB--address\fR option (e.g. \fB-a\fR 192.0.= 2.1/24). > Mixing \fB-n\fR with CIDR notation results in an error. > +When indicated, this option sets the prefix length of the first configur= ed > +IPv4 address only. This update also seems like it belongs in a different patch in the series. > If no address is indicated, the netmask associated with the adopted host= address, > if any, is used. If an address is indicated, but without a prefix length= , the > netmask is determined based on the corresponding network class. In all o= ther > diff --git a/pasta.c b/pasta.c > index c51e4cd..b3936f5 100644 > --- a/pasta.c > +++ b/pasta.c > @@ -343,14 +343,15 @@ void pasta_ns_conf(struct ctx *c) > =20 > if (c->ifi4) { > if (c->ip4.no_copy_addrs) { > - a =3D fwd_get_addr(c, AF_INET, 0, 0); > - if (a) { > + for_each_addr(a, c->addrs, c->addr_count, AF_INET) { > plen =3D inany_prefix_len(&a->addr, > a->prefix_len); > rc =3D nl_addr_set(nl_sock_ns, > c->pasta_ifi, AF_INET, > inany_v4(&a->addr), > plen); > + if (rc < 0) > + break; > } > } else { > rc =3D nl_addr_dup(nl_sock, c->ifi4, > @@ -404,13 +405,14 @@ ipv4_done: > 0, IFF_NOARP); > =20 > if (c->ip6.no_copy_addrs) { > - a =3D fwd_get_addr(c, AF_INET6, 0, 0); > - if (a) > + for_each_addr(a, c->addrs, c->addr_count, AF_INET6) { > rc =3D nl_addr_set(nl_sock_ns, > c->pasta_ifi, > - AF_INET6, > - &a->addr.a6, > + AF_INET6, &a->addr.a6, > a->prefix_len); > + if (rc < 0) > + break; > + } > } else { > rc =3D nl_addr_dup(nl_sock, c->ifi6, > nl_sock_ns, c->pasta_ifi, > --=20 > 2.52.0 >=20 --=20 David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson --mEL2rvoHmVNBaoRw Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmoUGqAACgkQzQJF27ox 2Gcc2w//SrFMOaSQNwtdajCKlHffQ7qvOwvq+QFEgV17pcjpF8x2T1Eb3yZSLR4f utKDu47uMEt3OTPxVr94J5dD4xy9Np1toxSDWK+xbuKE46r5xi6aBr+Dg4H+Zzs4 K9GajUGtwASCLDZSMLXkvMgbwnGhMIp6U03N9CEB1k8RDdvYUH3vR8t3qKzgGalL SPGpl/OevRuIr4yYiE15fZ1/EGZQYoUYzsTT4Ki7hUQn08SsRyprvYWduLYCFHVO w3AWK3tv1zOGfWof7D1QgIsCAaqzrp0k0E7IQkIMuRGrM1FFN5PqWZvy8BKczh5b FEqtWnAOmd9zM+71lAQHHsVcd9p/C+cNOiowmKZHaFNa/Wt450FYfM9nYVUefLl7 rYZrwufhv1g/jaHbyt4wYpi8yQ20D/hlZIM0sZMEFkLyR/pZ3jzrnI0OCRnUhLmk 225S4Q5gb1XWMEcWEA7cD19z6Hfba4RngNU9dGBwDG8CaUhf+rJojanWy247p+Xl uHGoo7qtArZKCId8VeTin4QUQfalAKqqvvznQkeRLPaRgVLkgq7DVIZj29/LRDsZ J1jIaCxLtWD+E73E/8fV1o4Xb+iwnSnO/r4ved2JGV95GwtLCC3/iKBmB+yXEn/p cJbTEqKJfheHcFwhvSBHpQYf1AYmlVr7Tc8qpwxAzT2ptWMcHkQ= =erpH -----END PGP SIGNATURE----- --mEL2rvoHmVNBaoRw--