From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hdxK6x9+; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id B49095A0262 for ; Mon, 30 Mar 2026 23:57:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774907869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y2oC7quVzwYajXEwlQVHyHGn3qFY0uQiQwhMX/4ahqM=; b=hdxK6x9+bMJISob0R1CGNZyA2il3iu6RLDeVbK7GEuUUHXVbvjtkLEc8d6PTGtV6YrObLK 5h/RIxMwitjHdwHFa5gf0CBznSXS9C2T7fS0QZxjnJ26vk7C1CbkiWX7LbUqCUTm36uVd5 iC2gebFlevx4CmmAbAPjItCnw9UwUcQ= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-675-06wTXC03PQGOzpm6JyT0_Q-1; Mon, 30 Mar 2026 17:57:48 -0400 X-MC-Unique: 06wTXC03PQGOzpm6JyT0_Q-1 X-Mimecast-MFC-AGG-ID: 06wTXC03PQGOzpm6JyT0_Q_1774907867 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-486fe36cf73so36538945e9.1 for ; Mon, 30 Mar 2026 14:57:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774907866; x=1775512666; h=date:content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Y2oC7quVzwYajXEwlQVHyHGn3qFY0uQiQwhMX/4ahqM=; b=J4+3XknyXThiIR3BFOrAdrslDocaXqc2GOYkUAYk5qp0yLRYFSwvQlsvWbjEx6+6u0 WuCcQYA4ob2iGuIWnwYUqswG/96SXr3n3ivuzivfAt8//mPI2f1mdWt9fcUhBXT54Zea +BmUPozerGaqIl5YxK/WWjCMnJ2Qjdf7+muTJ2PhBQMLJFHFYZ++qxpADtU/NjkATsuS n/hxosuEmS/xhWxM11Rbzkw6O7Oeqj0Umfj6sP6nstDQqvCpfelNs+RjtnVOkRa6FuHY 4LFdVCkD2wceV2dF6+tjeSECBa5+V51uylEX+VeI/O/6KSs/4PJUbk5kodxCoDDBrKah KWpQ== X-Forwarded-Encrypted: i=1; AJvYcCWkpLYyR0h+KQdx0tyqVxiZHk1L9LyKGUq11W8Ru734ISDseleJF+ijVbPu3B5N9yunNIIb0MCFadU=@passt.top X-Gm-Message-State: AOJu0YwOq3nbRlrune/iXGr+6wyrVdhoiMB87Niy9DrX8zUHL7P9umEm NtRa2cUlBUuk04l5iaG5f9gbwJ/Xr9MEQEuKNYLBZU/MyTIq133qq6NBkiztnRlT8hsmvzxlN1t QugAUzJgmPl+1g+q7mNpuDZhvKyPq4J29O8S4sHQr3sK0VcqEEeOAohnchFeCKg== X-Gm-Gg: ATEYQzwQ4ys5zM273mqCJZhaeMy29jWynRQY7N5v4uxCmNGa5QIfZaB8GLMZxxm3110 TIHUPIn983y0GJLeWegiRH9zH/ffIHb6v012pKIY+2tCZDKLsIsfjVkfzGmj9h9wnk1heDdlv8E rjx0zE+XJJUjURPDAS8uRVwkcnjKXq/5n83YGmp8gQMd5n22zMTcPo1i5KFVTun3PGfLveo8c5W WilHNYOI/NgsK4+4Fo7BbgVePWHmwBWjO6dxuj2NXruuqBB/KYlkVNKSUvQXlbtaGf2jNmpsOYV UjnuzYj9vVKX1z5vW3yLBUPYkDTj3t8YJLSBzwaMKPnO9NxDxPahXhhIjS+hBdQ84OaakuMSmdG Zp2SluE1fyng4JjVguQhwX5NtASnqHO4T X-Received: by 2002:a05:600c:1d08:b0:486:fab9:a578 with SMTP id 5b1f17b1804b1-48727e95417mr231755865e9.11.1774907866393; Mon, 30 Mar 2026 14:57:46 -0700 (PDT) X-Received: by 2002:a05:600c:1d08:b0:486:fab9:a578 with SMTP id 5b1f17b1804b1-48727e95417mr231755635e9.11.1774907865906; Mon, 30 Mar 2026 14:57:45 -0700 (PDT) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [2a10:fc81:a806:d6a9::1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722d40741sm325295815e9.13.2026.03.30.14.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 14:57:45 -0700 (PDT) From: Stefano Brivio To: Jon Maloy Subject: Re: [PATCH v6 05/13] conf: Allow multiple -a/--address options per address family Message-ID: <20260330235744.503026b4@elisabeth> In-Reply-To: <20260322004333.365713-6-jmaloy@redhat.com> References: <20260322004333.365713-1-jmaloy@redhat.com> <20260322004333.365713-6-jmaloy@redhat.com> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.49; x86_64-pc-linux-gnu) MIME-Version: 1.0 Date: Mon, 30 Mar 2026 23:57:45 +0200 (CEST) X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KOXgqF9f1FvipCIDUMv90B0JUCkCQEhhWtz-Mjg0bEU_1774907867 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: HICOUKDFGRSQXCMSVKMTVUL5WTHYY7YA X-Message-ID-Hash: HICOUKDFGRSQXCMSVKMTVUL5WTHYY7YA X-MailFrom: sbrivio@redhat.com 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: david@gibson.dropbear.id.au, 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: On Sat, 21 Mar 2026 20:43:25 -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. > > Signed-off-by: Jon Maloy > > --- > 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 > --- > conf.c | 7 ++++--- > fwd.c | 7 ++----- > pasta.c | 17 ++++++++++------- > 3 files changed, 16 insertions(+), 15 deletions(-) > > diff --git a/conf.c b/conf.c > index 8f02494..95f09cb 100644 > --- a/conf.c > +++ b/conf.c > @@ -935,9 +935,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" > @@ -1891,7 +1893,6 @@ void conf(struct ctx *c, int argc, char **argv) > IN6_IS_ADDR_V4COMPAT(&addr.a6)) > die("Invalid address: %s", optarg); > > - /* Legacy behaviour: replace existing address if any */ This needs an update to the man page. > fwd_set_addr(c, &addr, CONF_ADDR_USER, prefix_len); > if (inany_v4(&addr)) > c->ip4.no_copy_addrs = true; > diff --git a/fwd.c b/fwd.c > index 695b5a5..2853c0e 100644 > --- a/fwd.c > +++ b/fwd.c > @@ -250,14 +250,12 @@ void fwd_neigh_table_init(const struct ctx *c) > } > > /** > - * 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/mapped format, 0-128 > * > - * Find the first existing entry of the same address family and > - * overwrite it, or create a new one if none exists > */ > void fwd_set_addr(struct ctx *c, const union inany_addr *addr, > uint8_t flags, int prefix_len) > @@ -266,8 +264,7 @@ void fwd_set_addr(struct ctx *c, const union inany_addr *addr, > > for (int i = 0; i < c->addr_count; i++) { > a = &c->addrs[i]; > - if ((inany_v4(addr) && inany_v4(&a->addr)) || > - (!inany_v4(addr) && !inany_v4(&a->addr))) > + if (inany_equals(addr, &a->addr)) > goto found; > } > > diff --git a/pasta.c b/pasta.c > index e88a893..6307c65 100644 > --- a/pasta.c > +++ b/pasta.c > @@ -342,12 +342,14 @@ void pasta_ns_conf(struct ctx *c) > > if (c->ifi4) { > if (c->ip4.no_copy_addrs) { > - a = fwd_get_addr(c, AF_INET, 0, 0); > - if (a) > + for_each_addr(a, c, AF_INET) { > rc = nl_addr_set(nl_sock_ns, > c->pasta_ifi, AF_INET, > inany_v4(&a->addr), > - a->prefix_len - 96); > + inany_prefix_len(a)); > + if (rc < 0) > + break; > + } > } else { > rc = nl_addr_dup(nl_sock, c->ifi4, > nl_sock_ns, c->pasta_ifi, > @@ -400,13 +402,14 @@ ipv4_done: > 0, IFF_NOARP); > > if (c->ip6.no_copy_addrs) { > - a = fwd_get_addr(c, AF_INET6, 0, 0); > - if (a) > + for_each_addr(a, c, AF_INET6) { > rc = 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 = nl_addr_dup(nl_sock, c->ifi6, > nl_sock_ns, c->pasta_ifi, -- Stefano