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=Bh6+5xWz; 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 28C525A0619 for ; Sun, 12 Oct 2025 21:33:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760297625; 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=PXcGrMoglO8AJAuc0MdrJaiM8JS1oJQnFkbSmpK9EFE=; b=Bh6+5xWzSS08Pix2bw4pPVcPnD6ZpDnDKfnui9tT6l3rb5zM/zvA8g8rAHqdimNnoxtvRr VZaZUVWDI4CQuU5ggYaIhrlMp9twsDdgnzfUXCie2Ae55WudlQF+WxZ+CiqJ0Mc5YXee0m g+AOssIB9RxuIs27C4yS8oW+WFZKcHs= 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-606-JyT3lrJENRG2BDftb3SV1A-1; Sun, 12 Oct 2025 15:33:44 -0400 X-MC-Unique: JyT3lrJENRG2BDftb3SV1A-1 X-Mimecast-MFC-AGG-ID: JyT3lrJENRG2BDftb3SV1A_1760297623 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 A1DE01800365; Sun, 12 Oct 2025 19:33:43 +0000 (UTC) Received: from jmaloy-thinkpadp16vgen1.rmtcaqc.csb (unknown [10.22.80.81]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8A2681800578; Sun, 12 Oct 2025 19:33:42 +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 v13 02/10] passt: add no_map_gw flag to struct ctx Date: Sun, 12 Oct 2025 15:33:29 -0400 Message-ID: <20251012193337.616835-3-jmaloy@redhat.com> In-Reply-To: <20251012193337.616835-1-jmaloy@redhat.com> References: <20251012193337.616835-1-jmaloy@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: z_4PkuLFz3zPHnJXPie_pB4xfwF3rXVVmWxqvx3gYro_1760297623 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: L45IW4CJK3FYFBGRXKCEGEXTDURM4W6H X-Message-ID-Hash: L45IW4CJK3FYFBGRXKCEGEXTDURM4W6H 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: Later in this series we will introduce a new initialization function which needs access to the 'no_map_gw' flag. This flag is currently a local variable inside the conf() call, where it is too early to call the new function. The new function needs both ctx->hash_secret and a valid ctx->fd_tap to be set, neither of which are initialized at that point. We therefore add the 'no_map_flag' to struct ctx, so it can be carried along and used by later functions. Signed-off-by: Jon Maloy --- conf.c | 10 +++++----- passt.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf.c b/conf.c index 66b9e63..6143b54 100644 --- a/conf.c +++ b/conf.c @@ -1410,7 +1410,7 @@ fail: */ void conf(struct ctx *c, int argc, char **argv) { - int netns_only = 0, no_map_gw = 0; + int netns_only = 0; const struct option options[] = { {"debug", no_argument, NULL, 'd' }, {"quiet", no_argument, NULL, 'q' }, @@ -1442,7 +1442,7 @@ void conf(struct ctx *c, int argc, char **argv) {"no-ra", no_argument, &c->no_ra, 1 }, {"no-splice", no_argument, &c->no_splice, 1 }, {"freebind", no_argument, &c->freebind, 1 }, - {"no-map-gw", no_argument, &no_map_gw, 1 }, + {"no-map-gw", no_argument, &c->no_map_gw, 1 }, {"ipv4-only", no_argument, NULL, '4' }, {"ipv6-only", no_argument, NULL, '6' }, {"one-off", no_argument, NULL, '1' }, @@ -1656,7 +1656,7 @@ void conf(struct ctx *c, int argc, char **argv) break; case 21: conf_nat(optarg, &c->ip4.map_host_loopback, - &c->ip6.map_host_loopback, &no_map_gw); + &c->ip6.map_host_loopback, &c->no_map_gw); break; case 22: conf_nat(optarg, &c->ip4.map_guest_addr, @@ -2005,11 +2005,11 @@ void conf(struct ctx *c, int argc, char **argv) } } - if (c->ifi4 && !no_map_gw && + if (c->ifi4 && !c->no_map_gw && IN4_IS_ADDR_UNSPECIFIED(&c->ip4.map_host_loopback)) c->ip4.map_host_loopback = c->ip4.guest_gw; - if (c->ifi6 && !no_map_gw && + if (c->ifi6 && !c->no_map_gw && IN6_IS_ADDR_UNSPECIFIED(&c->ip6.map_host_loopback)) c->ip6.map_host_loopback = c->ip6.guest_gw; diff --git a/passt.h b/passt.h index 0075eb4..830bc36 100644 --- a/passt.h +++ b/passt.h @@ -310,6 +310,7 @@ struct ctx { int no_ndp; int no_ra; int no_splice; + int no_map_gw; int host_lo_to_ns_lo; int freebind; -- 2.50.1