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=gAFBtdr7; 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 1DDE75A0271 for ; Sun, 22 Mar 2026 01:43:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774140224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=12ijgPY1s6xR7CR99KG+ZafqZfe/qhrkpB9FhWusBIY=; b=gAFBtdr7w3HWR1pux+xBgaGPDGBNJ7v76KmLu3ZqW6d5nJ1AggCyBKl6D3BDRLxh4zDoku ohf5K0+bB+mfW7JFJlc2btu7HPNwTl37PRfnf+h7WWFxsZYJqMSFHz3sX4q86mk59670PD EmKno/fBR6Va3SK+H+o+q3qEv8HyYwQ= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-397-jgwSt2P8MZi6nPcbH43JIA-1; Sat, 21 Mar 2026 20:43:42 -0400 X-MC-Unique: jgwSt2P8MZi6nPcbH43JIA-1 X-Mimecast-MFC-AGG-ID: jgwSt2P8MZi6nPcbH43JIA_1774140222 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F208819560B4; Sun, 22 Mar 2026 00:43:41 +0000 (UTC) Received: from jmaloy-thinkpadp16vgen1.rmtcaqc.csb (unknown [10.22.64.183]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 209DB18001FE; Sun, 22 Mar 2026 00:43:41 +0000 (UTC) From: Jon Maloy To: sbrivio@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, jmaloy@redhat.com, passt-dev@passt.top Subject: [PATCH v6 05/13] conf: Allow multiple -a/--address options per address family Date: Sat, 21 Mar 2026 20:43:25 -0400 Message-ID: <20260322004333.365713-6-jmaloy@redhat.com> In-Reply-To: <20260322004333.365713-1-jmaloy@redhat.com> References: <20260322004333.365713-1-jmaloy@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: jGrQ_oHt7WBrBy61EFpAafsKj-wTc1ylbu8jC2zr81Q_1774140222 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: VMI7T2WPYK2PXIJA56RQUII2F7G7HJIP X-Message-ID-Hash: VMI7T2WPYK2PXIJA56RQUII2F7G7HJIP X-MailFrom: jmaloy@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 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: 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 */ 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, -- 2.52.0