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=202606 header.b=CCp6N07h; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 13D405A0653 for ; Thu, 02 Jul 2026 02:59:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202606; t=1782953982; bh=XJrtrZM+jrVM6t0ARHUIqpV2F/SX5c3qX/SxYFNbjyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CCp6N07hQrOs6nuJT6UqLsdUZ4sguZWozE6xAACvA0V2nWZMbC3TQLw05peFN+NP5 q3jf3wmzw1YlLvVsZ9YZ2AEpqgEgFGOsd1UQgGJZThiU9PKd0cmg2CFensJaIAOWXo lwDA0nA9I2X+/K5cXN0DjG3rSI6HlvxOyX68rnv/IURyuM5qsc7bqvt9dHCGzByETL euXG2O7jrqFbEd4vqhHxe4x5eR8G9LDMHrQN4zyl5IhzrxGZHnjyFC0MYi2xL/U6h/ N8+6F65NEYO4ybn/3ZFmb8QEWeXH/JqKa96EpHcFy9bY1Mpjj/5rTEfZpGpHXzYni8 GoNwJ3HOphLWQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4grJSZ1fR5z58mm; Thu, 02 Jul 2026 10:59:42 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 10/13] conf: Remove unnecessary mode checks from conf_addr() Date: Thu, 2 Jul 2026 10:58:58 +1000 Message-ID: <20260702005901.2010709-11-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260702005901.2010709-1-david@gibson.dropbear.id.au> References: <20260702005901.2010709-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: UNB3QMHPISMSFXUWXJVSSL73H245AQLT X-Message-ID-Hash: UNB3QMHPISMSFXUWXJVSSL73H245AQLT 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: conf_addr() sets c->ip[46]no_copy_addrs conditional upon being in pasta mode. That sort of makes sense, since address copying is only a thing for pasta mode. However, setting the variables anyway is harmless, and arguably more logically consistent. If we had a way of copying addresses for passt mode (or some future mode), it would still be incorrect to do so in these circumstances. So, make the assignments unconditional. Signed-off-by: David Gibson --- conf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf.c b/conf.c index 3614776c..d1889e0c 100644 --- a/conf.c +++ b/conf.c @@ -1203,13 +1203,11 @@ static bool conf_addr(struct ctx *c, char *arg, uint8_t opt_n) c->ip4.addr = *inany_v4(&addr); c->ip4.prefix_len = prefix_len - 96; c->ip4.addr_fixed = true; - if (c->mode == MODE_PASTA) - c->ip4.no_copy_addrs = true; + c->ip4.no_copy_addrs = true; } else { c->ip6.addr = addr.a6; c->ip6.addr_fixed = true; - if (c->mode == MODE_PASTA) - c->ip6.no_copy_addrs = true; + c->ip6.no_copy_addrs = true; } return is_prefix; -- 2.54.0