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=ns19I/+I; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 6E8C65A0275 for ; Wed, 01 Jul 2026 07:32:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202606; t=1782883921; bh=XJrtrZM+jrVM6t0ARHUIqpV2F/SX5c3qX/SxYFNbjyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ns19I/+I/DMw8eSzK31LbrdkjbFr2IN888ikX3ONfOHOJTLZAn6tsE6pAoLuLswzx XlmMGLFUmQMtdNOM0xxRdft5yaOhDk+F7nho3EIioL/uByW4AyyXHhHZEhskiAcYSx J8TVHAMlzSAqrTnWrAKxUnomahrfuKy7HwwJD3x8Vq6z8Pnq/GUwlV4yXfHKx13SQo V8AmFUSbZEFeJyPHaHwb6UTJnq3DRwtk/u+e/idbRkg0DzRm2SN3JlfONHx/HRYrIo ix3eBKk9IGuG4QQ6MYCMwQywNR9dPih3ju4E2OpVq9DZDoDLQUJYGcRKli8G4XGImG mmtu1Qlbx7NSg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4gqpYF1JnKz58df; Wed, 01 Jul 2026 15:32:01 +1000 (AEST) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 10/13] conf: Remove unnecessary mode checks from conf_addr() Date: Wed, 1 Jul 2026 15:31:52 +1000 Message-ID: <20260701053155.1219264-11-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260701053155.1219264-1-david@gibson.dropbear.id.au> References: <20260701053155.1219264-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: TZUOFH3XVQH25BN3TLJZRUNL4D2BEDML X-Message-ID-Hash: TZUOFH3XVQH25BN3TLJZRUNL4D2BEDML 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