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=Jvp/TNDb; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 3D9795A0271 for ; Fri, 26 Jun 2026 09:10:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202606; t=1782457808; bh=9eZdeCbO7UWBodW5ph2fXWQNbpg4UAXRNu+mlvw+aWs=; h=From:To:Cc:Subject:Date:From; b=Jvp/TNDbfECIcAsiC2z5+t0qw/YJevdHt0CUE3OrYPaUxR4bVJRyBG/Ic70QRVdze qXJIgrMUiQzBoyMCxGdwfZsftDRTjnUYwCZInmE/RDHmaG/R+pIcV7D8ohnvNSx7aN GLfnX3nYUmUytR3dgJ5dHe2YsWSfIg60Hx1rI6MXg1FkSHBLNc5S4pg8bc8UvZhSo/ SJEb05+mUkYXcDRx57Im03WDbQfezDzvxC39Tl30GJZe6Hqd7jjr2fFzG7YIQLYPZr lqid3vfYQCvx84OgLhw47g5UUHRLP23c/X7SEEAgWwCtMJudqhINrJdhwmwS/eQTl9 Aq6DnFf3Gw2TQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4gmmym2yp2z4wTT; Fri, 26 Jun 2026 17:10:08 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 00/12] Rework option parsing in preparation for destination remapping Date: Fri, 26 Jun 2026 17:09:51 +1000 Message-ID: <20260626071003.3472194-1-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.54.0 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: JRIKNDGMT6AZZAZYGY7UTQ5D2G2O4D67 X-Message-ID-Hash: JRIKNDGMT6AZZAZYGY7UTQ5D2G2O4D67 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: This was... a bit of a nightmare. It took way too long and went down a bunch of blind alleys. I'm not sure how much I like the final result: it's pleasingly terse in some cases, but in others it feels dangerously subtle, requiring a pretty careful understanding of the sequencing rules of C's &&, || and , operators. That said, while I was at many points ready to pack it in and hack my around the problems limiting the parsing for destination remapping, I couldn't really think of feasible way to do that either. So, here we are. David Gibson (12): Makefile: Add missing PESTO_HEADERS variable conf: Use parameter instead of global in conf_nat() parse: Start splitting out parsing helpers conf: Remove duplicate parsing of -F option conf: Clean up conf_ip4_prefix() parse: Add helper to parse unsigned integer values parse: Move parse_port_range() to new parsing framework parse: Add helpers for parsing IP addresses conf: Move address configuration into helper function conf: Use new parsing tools to handle -a option fwd_rule: Allow "all" port specs to be combined with other options fwd_rule: Rewrite forward rule parsing using parse.c helpers Makefile | 22 +-- common.h | 3 + conf.c | 209 ++++++++++++++++------------ conf.h | 1 + fwd_rule.c | 392 +++++++++++++++++++++++------------------------------ fwd_rule.h | 2 - inany.c | 70 +--------- inany.h | 3 - parse.c | 243 +++++++++++++++++++++++++++++++++ parse.h | 37 +++++ util.c | 12 +- 11 files changed, 591 insertions(+), 403 deletions(-) create mode 100644 parse.c create mode 100644 parse.h -- 2.54.0