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=gHQkzDcG; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id D7CEE5A026D for ; Tue, 17 Feb 2026 23:18:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1771366711; 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=8aZtIrw7DA58uWzYmiSlfEAttOEaNRLH8BbZD1VLtNg=; b=gHQkzDcGqp8TVr2vIl7AzTcSG84FghmIB3j0U1HHQMUTaX3oSgD/E1I7zjEVaLmscRgrQ6 y6i5mahC8VKlo/T3OXEK011eT+8OKqXqvhNO//Z/T6YlyEfaRsJ3Wcb4J+NMniRRliDdip 8G+sirXba5OIcanxAHyXi8ROX2aX17U= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-670-F3a6KQJJMBqOxPXnwuL6Fw-1; Tue, 17 Feb 2026 17:18:30 -0500 X-MC-Unique: F3a6KQJJMBqOxPXnwuL6Fw-1 X-Mimecast-MFC-AGG-ID: F3a6KQJJMBqOxPXnwuL6Fw_1771366709 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5C782180049D; Tue, 17 Feb 2026 22:18:29 +0000 (UTC) Received: from jmaloy-thinkpadp16vgen1.rmtcaqc.csb (unknown [10.22.80.48]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DE4791800348; Tue, 17 Feb 2026 22:18:27 +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 v4 07/12] conf: Allow multiple -a/--address options per address family Date: Tue, 17 Feb 2026 17:18:09 -0500 Message-ID: <20260217221814.4053583-8-jmaloy@redhat.com> In-Reply-To: <20260217221814.4053583-1-jmaloy@redhat.com> References: <20260217221814.4053583-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: NYVC2NRYi6jkOBBYyIeUrUIzTjU4D0_JXIRxRt2Zlcs_1771366709 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: NQVQUFODN2HX7EUBCLE64BA6IBZLMLEZ X-Message-ID-Hash: NQVQUFODN2HX7EUBCLE64BA6IBZLMLEZ 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. --- conf.c | 41 ++++++++++++++++++++++++----------------- pasta.c | 29 +++++++++++++++-------------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/conf.c b/conf.c index b894ec5..ca0a764 100644 --- a/conf.c +++ b/conf.c @@ -906,9 +906,10 @@ 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 32 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"); + 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" @@ -1848,32 +1849,38 @@ void conf(struct ctx *c, int argc, char **argv) IN6_IS_ADDR_V4COMPAT(&addr.a6)) die("Invalid address: %s", optarg); - /* Legacy behaviour: overwrite existing address if any */ - if (inany_v4(&addr)) { - e = first_v4(c); - if (!e) - e = &c->addrs[c->addr_count++]; - if (c->mode == MODE_PASTA) - c->ip4.no_copy_addrs = true; - } else { - e = first_v6(c); - if (!e) - e = &c->addrs[c->addr_count++]; - if (c->mode == MODE_PASTA) - c->ip6.no_copy_addrs = true; - } + for_each_addr(e, c, AF_UNSPEC) + if (inany_equals(&addr, &e->addr)) + die("Address exists: %s", optarg); + + if (c->addr_count >= INANY_MAX_ADDRS) + die("Max addresses is %d", INANY_MAX_ADDRS); + + e = &c->addrs[c->addr_count++]; e->prefix_len = prefix_len; e->addr = addr; e->flags = CONF_ADDR_USER; + + if (c->mode != MODE_PASTA) + break; + + if (inany_v4(&addr)) + c->ip4.no_copy_addrs = true; + else + c->ip6.no_copy_addrs = true; break; } case 'n': { struct inany_addr_entry *e; - int plen; + int plen, i = 0; if (addr_has_prefix_len) die("Redundant prefix length specification"); + for_each_addr(e, c, AF_INET) + if (++i > 1) + die("Use -n only when one address"); + plen = conf_ip4_prefix(optarg); if (plen < 0) die("Invalid prefix length: %s", optarg); diff --git a/pasta.c b/pasta.c index 59f5ba8..dd23a14 100644 --- a/pasta.c +++ b/pasta.c @@ -312,13 +312,14 @@ static void pasta_ns_conf_ip4(struct ctx *c) int rc = 0; if (c->ip4.no_copy_addrs) { - const struct inany_addr_entry *e = first_v4(c); + const struct inany_addr_entry *e; - if (e) - rc = nl_addr_set(nl_sock_ns, - c->pasta_ifi, AF_INET, - inany_v4(&e->addr), - inany_prefix4(e)); + for_each_addr(e, c, AF_INET) { + rc = nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET, + inany_v4(&e->addr), inany_prefix4(e)); + if (rc < 0) + break; + } } else { rc = nl_addr_dup(nl_sock, c->ifi4, nl_sock_ns, c->pasta_ifi, @@ -371,14 +372,14 @@ static void pasta_ns_conf_ip6(struct ctx *c) 0, IFF_NOARP); if (c->ip6.no_copy_addrs) { - const struct inany_addr_entry *e = first_v6(c); - - if (e) - rc = nl_addr_set(nl_sock_ns, - c->pasta_ifi, - AF_INET6, - &e->addr.a6, - e->prefix_len); + const struct inany_addr_entry *e; + + for_each_addr(e, c, AF_INET6) { + rc = nl_addr_set(nl_sock_ns, c->pasta_ifi, + AF_INET6, &e->addr.a6, e->prefix_len); + if (rc < 0) + break; + } } else { rc = nl_addr_dup(nl_sock, c->ifi6, nl_sock_ns, c->pasta_ifi, -- 2.52.0