From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=fail (p=quarantine dis=none) header.from=redhat.com 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 493055A0271 for ; Fri, 20 Nov 2026 20:24:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1795202688; 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=kpIG+eZK/XsbO9xfuzdEzDTGFhg9j2XkQhY0No0kNyE=; b=V9XvbyGtEHsduA2ptrwQTgsok5RT64J2kpSzeQ4v0t34UgOGTEG9KrzOiCX1cIRR+aJcjf Ch/rGIO/evdxFqVMl8SLHPF2+ufLOAJAPmVoEslA/fpnBMRSCzk20pm2Ab4SePyfmjJJnx eNSrcas7D5cssH6jn5qiHdXOLU1qvjM= Received: from mx-prod-mc-06.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-389-3wiswfLFMLm7VG1h5UMtnw-1; Fri, 20 Nov 2026 19:24:46 +0000 X-MC-Unique: 3wiswfLFMLm7VG1h5UMtnw-1 X-Mimecast-MFC-AGG-ID: 3wiswfLFMLm7VG1h5UMtnw_1795202685 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2A4621800352; Fri, 20 Nov 2026 19:24:45 +0000 (UTC) Received: from jmaloy-thinkpadp16vgen1.redhat.corp (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 10C1018004FC; Fri, 20 Nov 2026 19:24:43 +0000 (UTC) From: Jon Maloy To: sbrivio@redhat.com, david@gibson.dropbear.id.au, jmaloy@redhat.com, passt-dev@passt.top Subject: [PATCH v9 4/5] conf: Allow multiple -a/--address options per address family Date: Fri, 20 Nov 2026 14:24:36 -0500 Message-ID: <20261120192437.1860855-5-jmaloy@redhat.com> In-Reply-To: <20261120192437.1860855-1-jmaloy@redhat.com> References: <20261120192437.1860855-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: kt0j54uByLSsPehaCI6W51yOtj7v49LcuDcTtuvrirI_1795202685 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: 4CFC4EUIFZVGBSAJCWMJYQTKCDYD4EAQ X-Message-ID-Hash: 4CFC4EUIFZVGBSAJCWMJYQTKCDYD4EAQ 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. Link: https://bugs.passt.top/show_bug.cgi?id=47 Cc: lemmi@nerd2nerd.org 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 v7: - Updated man page. v8: - Adapted to previous changes in this series - Updated according to comments from David G. v9: - Adapted to previous changes in this series --- conf.c | 6 ++++-- fwd.c | 9 +++++---- passt.1 | 18 ++++++++---------- pasta.c | 27 +++++++++++++++------------ 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/conf.c b/conf.c index 27656271..f0a87d8f 100644 --- a/conf.c +++ b/conf.c @@ -628,9 +628,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" diff --git a/fwd.c b/fwd.c index 5716c9ad..8fbabb29 100644 --- a/fwd.c +++ b/fwd.c @@ -250,8 +250,7 @@ void fwd_neigh_table_init(const struct ctx *c) * @flags: CONF_ADDR_* flags for this address * @prefix_len: Prefix length in IPv6 format (96-128 for IPv4-mapped) * - * Find the first existing entry of the same address family and - * overwrite it, or create a new one if none exists + * Update the existing entry for @addr, if any, or append a new one */ void fwd_set_addr(struct ctx *c, const union inany_addr *addr, uint8_t flags, int prefix_len) @@ -260,8 +259,10 @@ void fwd_set_addr(struct ctx *c, const union inany_addr *addr, assert(flags); - for_each_addr(a, c->addrs, c->addr_count, inany_af(addr)) - goto found; + for_each_addr(a, c->addrs, c->addr_count, inany_af(addr)) { + if (inany_equals(&a->addr, addr)) + goto found; + } if (c->addr_count >= MAX_GUEST_ADDRS) return; diff --git a/passt.1 b/passt.1 index 5d236bdc..cdaaf96a 100644 --- a/passt.1 +++ b/passt.1 @@ -169,16 +169,14 @@ 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. -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 interfaces -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 for 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.254.2.1 -is assigned for IPv4, and no additional address will be assigned for IPv6. +This option can be given multiple times, indicating multiple different +addresses. By default, assigned IPv4 and IPv6 addresses are taken from +the host interfaces 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 for 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.254.2.1 is assigned for +IPv4, and no additional address will be assigned for IPv6. .TP .BR \-n ", " \-\-netmask " " \fImask diff --git a/pasta.c b/pasta.c index 4cd58fd7..02bd87e5 100644 --- a/pasta.c +++ b/pasta.c @@ -303,6 +303,7 @@ static int pasta_conf_addrs(const struct ctx *c, sa_family_t af, int ifi, bool no_copy) { const struct guest_addr *a; + int rc = 0; if (!ifi) return 0; @@ -310,21 +311,23 @@ static int pasta_conf_addrs(const struct ctx *c, sa_family_t af, int ifi, if (!no_copy) return nl_addr_dup(nl_sock, ifi, nl_sock_ns, c->pasta_ifi, af); - a = fwd_get_addr(c, af, true, CONF_ADDR_ANY); - if (!a) - return 0; - - if (af == AF_INET) { - const struct in_addr *a4; - int plen = 0; + for_each_addr(a, c->addrs, c->addr_count, af) { + if (af == AF_INET) { + const struct in_addr *a4; + int plen = 0; - a4 = inany_prefix_v4(&a->addr, a->prefix_len, &plen); - return nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET, - a4, plen); + a4 = inany_prefix_v4(&a->addr, a->prefix_len, &plen); + rc = nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET, + a4, plen); + } else { + rc = nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET6, + &a->addr.a6, a->prefix_len); + } + if (rc < 0) + break; } - return nl_addr_set(nl_sock_ns, c->pasta_ifi, AF_INET6, - &a->addr.a6, a->prefix_len); + return rc; } /** -- 2.56.1