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=E2AQVrzL; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 8EE775A0626 for ; Mon, 23 Mar 2026 09:32:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1774254767; bh=omlicTzUsA3WPmeSVsQLsWJtrey0imdt4DZefyJ9zvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E2AQVrzLGwGyA2NLh3p0ZfJL7rDLMmmbQlvjhu1sShPxmLpVpECvqXElidA2VKvxZ zNp6KvsOWgFMYflmypmsCBcOokh22RdKtoeN/ngmXnap0tXDtE5k+PVZEC6uDfVzeE 4mT0JhEChDxSSSMFsQI5vQ9XAMqTCtPuzwfmKej6PpUjSb1/4YSjUBFH2L5ivw2Ehn kMpQQ4XKeJjhmeaSVdRjxWZ/kYyE1uu1RQ8ak3DhFbNmCkWwCcrQ0jyjoagnfD0rSW 6IpJxAAu/16Ev6O/YY31TQDzAJYP7VWPyEk0r+VJ7yrnr1AK69lanjWTGYhJ0ww+0W 0WxewCOoQNE9w== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ffRHz4RjXz4wHX; Mon, 23 Mar 2026 19:32:47 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v3 08/25] fwd: Allow FWD_DUAL_STACK_ANY flag to be passed directly to fwd_rule_add() Date: Mon, 23 Mar 2026 18:37:15 +1100 Message-ID: <20260323073732.3158468-9-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323073732.3158468-1-david@gibson.dropbear.id.au> References: <20260323073732.3158468-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: S24IZG5OVVBYKUQNS65M3VGA3JYQMSZ7 X-Message-ID-Hash: S24IZG5OVVBYKUQNS65M3VGA3JYQMSZ7 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: David Gibson 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: fwd_rule_add() takes a flags parameter, but it only allows the FWD_WEAK and FWD_SCAN flags to be specified there. It doesn't allow the FWD_DUAL_STACK_ANY flag to be set, instead expecting a [*] address to be indicated by passing NULL as @addr. However, for upcoming dynamic rule updates, it's more convenient to be able to explicitly pass FWD_DUAL_STACK_ANY along with an address of ::. Allow that mode of calling. Signed-off-by: David Gibson --- fwd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fwd.c b/fwd.c index 3395a28e..d73b7ca7 100644 --- a/fwd.c +++ b/fwd.c @@ -362,18 +362,21 @@ void fwd_rule_add(struct fwd_table *fwd, uint8_t proto, uint8_t flags, in_port_t first, in_port_t last, in_port_t to) { /* Flags which can be set from the caller */ - const uint8_t allowed_flags = FWD_WEAK | FWD_SCAN; + const uint8_t allowed_flags = FWD_WEAK | FWD_SCAN | FWD_DUAL_STACK_ANY; unsigned num = (unsigned)last - first + 1; struct fwd_rule *new; unsigned i, port; assert(!(flags & ~allowed_flags)); - if (fwd->count >= ARRAY_SIZE(fwd->rules)) die("Too many port forwarding ranges"); if ((fwd->sock_count + num) > ARRAY_SIZE(fwd->socks)) die("Too many listening sockets"); + /* Passing a non-wildcard address with DUAL_STACK_ANY is a bug */ + assert(!(flags & FWD_DUAL_STACK_ANY) || !addr || + inany_equals(addr, &inany_any6)); + /* Check for any conflicting entries */ for (i = 0; i < fwd->count; i++) { char newstr[INANY_ADDRSTRLEN], rulestr[INANY_ADDRSTRLEN]; -- 2.53.0