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=HF28ZOZO; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 7F57D5A0265 for ; Mon, 02 Mar 2026 11:51:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1772448676; bh=vEkZByAFPU9FNfQYvLLu7lkulZ5mq386utNPP4jTW1c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=HF28ZOZOtN6CbH0l0iUc122PDROfdVLlPhpOk/lTU+yt8D+b5BxicBx6ZeyyKMA9V szoEl4EWbaaDwWwNzVtINpY6rj/Yf1PFx1ZYowXDqPqUnz+Hg5FkcYVn1I/35b9odK v4E5PyAn4jlMiVOXj9V2PiU/7SeaPrdfp8YZ8WbcvdpAsdxUoEXhvLlapnLHx4Jyqh hLG2eUd12FuSpN4ZzlQHRbdqnMXJSbGSdV6KbMVVsMb4g99cHKSinoczpcBul6ddPF k9n1DECbIIEfMWL/DxhkwZK/uwlImNJb1iUGFph9jakgfdVFY61ZOCZUArMjB0ovJI BEoMhJ8LGT5ew== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4fPbMS5dKKz4wBF; Mon, 02 Mar 2026 21:51:16 +1100 (AEDT) Date: Mon, 2 Mar 2026 21:51:10 +1100 From: David Gibson To: Jon Maloy Subject: Re: [PATCH v5 06/13] conf: Allow multiple -a/--address options per address family Message-ID: References: <20260222174445.743845-1-jmaloy@redhat.com> <20260222174445.743845-7-jmaloy@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="jk/7PBb7ywl5vZ/q" Content-Disposition: inline In-Reply-To: <20260222174445.743845-7-jmaloy@redhat.com> Message-ID-Hash: 2ULXX2GM75MJAU6BI5DFXPTEDH7D4XX4 X-Message-ID-Hash: 2ULXX2GM75MJAU6BI5DFXPTEDH7D4XX4 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, dgibson@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: --jk/7PBb7ywl5vZ/q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 22, 2026 at 12:44:38PM -0500, 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 G Gibson. > v4: - Stripped down and adapted after feedback from David G. > --- > conf.c | 41 ++++++++++++++++++++++++----------------- > pasta.c | 17 ++++++++++------- > 2 files changed, 34 insertions(+), 24 deletions(-) >=20 > diff --git a/conf.c b/conf.c > index eb967c7..35ef994 100644 > --- a/conf.c > +++ b/conf.c > @@ -915,9 +915,10 @@ 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 32 times\n" You can use macro stringification to keep this accurate even if INANY_MAX_ADDRS is altered. Oh.. didn't note this in 1/13, but like the name of struct inany_addr_entry, the "inany" isn't really pertinent in INANY_MAX_ADDRS. Maybe MAX_GUEST_ADDRS? > " 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"); > + 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" > @@ -1874,32 +1875,38 @@ void conf(struct ctx *c, int argc, char **argv) > IN6_IS_ADDR_V4COMPAT(&addr.a6)) > die("Invalid address: %s", optarg); > =20 > - /* Legacy behaviour: overwrite existing address if any */ > - if (inany_v4(&addr)) { > - e =3D first_v4(c); > - if (!e) > - e =3D &c->addrs[c->addr_count++]; > - if (c->mode =3D=3D MODE_PASTA) > - c->ip4.no_copy_addrs =3D true; > - } else { > - e =3D first_v6(c); > - if (!e) > - e =3D &c->addrs[c->addr_count++]; > - if (c->mode =3D=3D MODE_PASTA) > - c->ip6.no_copy_addrs =3D true; > - } > + for_each_addr(e, c, AF_UNSPEC) > + if (inany_equals(&addr, &e->addr)) > + die("Address exists: %s", optarg); > + > + if (c->addr_count >=3D INANY_MAX_ADDRS) > + die("Max addresses is %d", INANY_MAX_ADDRS); > + > + e =3D &c->addrs[c->addr_count++]; > e->prefix_len =3D prefix_len; > e->addr =3D addr; > e->flags =3D CONF_ADDR_USER; > + > + if (c->mode !=3D MODE_PASTA) > + break; I don't think you need this - the logic below will do nothing in passt mode, but it should be harmless. > + if (inany_v4(&addr)) > + c->ip4.no_copy_addrs =3D true; > + else > + c->ip6.no_copy_addrs =3D true; > break; > } > case 'n': { > struct inany_addr_entry *e; > - int plen; > + int plen, i =3D 0; > =20 > if (addr_has_prefix_len) > die("Redundant prefix length specification"); > =20 > + for_each_addr(e, c, AF_INET) > + if (++i > 1) 'i' is usually a loop index, but here its a count. Maybe 'n', instead? Having -n apply to the most recent address would also be an acceptable choice, IMO. > + die("Use -n only when one address"); > + > plen =3D conf_ip4_prefix(optarg); > if (plen < 0) > die("Invalid prefix length: %s", optarg); > diff --git a/pasta.c b/pasta.c > index 54010de..7a081e7 100644 > --- a/pasta.c > +++ b/pasta.c > @@ -342,12 +342,14 @@ void pasta_ns_conf(struct ctx *c) > =20 > if (c->ifi4) { > if (c->ip4.no_copy_addrs) { > - e =3D first_v4(c); > - if (e) > + for_each_addr(e, c, AF_INET) { > rc =3D nl_addr_set(nl_sock_ns, > c->pasta_ifi, AF_INET, > inany_v4(&e->addr), > - e->prefix_len - 96); > + inany_prefix4(e)); If you update nl_addr_set() to take an inany, you can do this in a single loop. > + if (rc < 0) > + break; > + } > } else { > rc =3D nl_addr_dup(nl_sock, c->ifi4, > nl_sock_ns, c->pasta_ifi, > @@ -400,13 +402,14 @@ ipv4_done: > 0, IFF_NOARP); > =20 > if (c->ip6.no_copy_addrs) { > - e =3D first_v6(c); > - if (e) > + for_each_addr(e, c, AF_INET6) { > rc =3D nl_addr_set(nl_sock_ns, > c->pasta_ifi, > - AF_INET6, > - &e->addr.a6, > + AF_INET6, &e->addr.a6, > e->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 --jk/7PBb7ywl5vZ/q Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmmla54ACgkQzQJF27ox 2Gf0Ew/8DTmz9fyYwNJ2FFPIbcFqF7IVYU0TVzhcAkGf9rFNpKDktUUceWc0H3Ro mEe4xlrqnTVQapy+V1/LcloMqJjsoByd2LqRL1Jv0BJ2FPJCITEDUd/+U1diUb+/ wIBp/ndAi2DGxG8xhxwHv/jdwEZ5rOya32wgGhIvG76L7QKFSVb7918T7TFN9Atm Aaw4c3AymdgRkqOT9pvO+MDyzctMNLjQDS+VQqz/ay4XbEDdxOGSlYVpWrUl+4NE RFHA56oQ15GV+U+QL4PYtRw1cywD7ushF610eN+h5iXe8Xjelu/Q9BjUkWl9jKNM WJvFMHlauJ4677SHmA7N+fCSbPrbvYVZl8/jcCzSHfANPtYpM7yUO8WuII3z/9bN iEb/in3SNzlG9deFYTUUPLvQaZhBuLi0svFbZy+CdcrWDzL0qLrfnfRvbauYH7K/ aj3eT3YsFNFGkt1Io/wXh/CRlX/RtGmqDqUSmcI9uQOHWLnDKOxmVB1GZ9BN+lpE xSzCuejscvTJhtYKiozNr6LbxVd/VZLKRWUTY5q7KYol/KkF+puMVDbHQw+3ujAn KT46z3Hz3oTOWAkX3R9TWbss9BXWtrzhbFNZBCO1L1QV5IWHF/w22Gud3z0+vbuf YpodT50g213qNfJxXXPk2PK/wSiv2Mgn/Q3dKNawfZuunUjtDr8= =DC9P -----END PGP SIGNATURE----- --jk/7PBb7ywl5vZ/q--