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=LjGBeJW/; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 514885A0269 for ; Thu, 02 Jul 2026 02:59:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202606; t=1782953982; bh=vBUrb1SAN3KO/m3Esz4ZusyzkGcbF0ukWuIlrHaDlzE=; h=From:To:Cc:Subject:Date:From; b=LjGBeJW/OOgg0GUp6EOmCb7FUo3mWMQ0Ow+PzBPkMR2M3If9Tcno7VMweZLprErmc N2zZIvoNtpicwkDm2vINX6AD0+zGb4agEbxU7BR06pHRNvKwIQ2janX9JiCnVO6XSk EnYukYRH4bAkcq972QMeZyuEusflXeX8MdSk4fUQNcsGlro5Sl4KfbFRURjQFHcPI2 KVi2CV20DPOMXESU5SQzSzNCS6uEAqWC87IhHKP22Rp6eDI6hJ/+noEWKwn7T/CNzz zwU3wFmCMEbqbSu8A4ezVdWbfUd4HADcmVA8B8KTy5tBTTPvpjGaKpwwoYGObF2012 WhQGluzikF46A== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4grJSZ0KDLz58dt; Thu, 02 Jul 2026 10:59:42 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 00/13] Rework option parsing in preparation for destination remapping Date: Thu, 2 Jul 2026 10:58:48 +1000 Message-ID: <20260702005901.2010709-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: RAAKVJ5OBN7BPUSN32MNCQYMH4OIZ5KY X-Message-ID-Hash: RAAKVJ5OBN7BPUSN32MNCQYMH4OIZ5KY 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. v3: * Fixed validation of ifnames in 13/13. * No other changes. v2: * Numerous minor tweaks based on Stefano's feedback. * The "minor issues" aren't actually minor - they're hard to solve in C, remain. David Gibson (13): 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: Remove unnecessary mode checks from conf_addr() 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 | 400 ++++++++++++++++++++++++----------------------------- fwd_rule.h | 2 - inany.c | 70 +--------- inany.h | 3 - parse.c | 244 ++++++++++++++++++++++++++++++++ parse.h | 37 +++++ util.c | 12 +- 11 files changed, 600 insertions(+), 403 deletions(-) create mode 100644 parse.c create mode 100644 parse.h -- 2.54.0