From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH 0/9] extensions: Merge *_DNAT and *_REDIRECT
Date: Wed, 30 Mar 2022 17:58:42 +0200 [thread overview]
Message-ID: <20220330155851.13249-1-phil@nwl.cc> (raw)
The multitude of data structures for kernel communication aside, code
for parsing/printing of DNAT and REDIRECT targets in both IPv4 and IPv6
are pretty similar. Stick them into a common source file and share as
much code as possible.
The first two patches are basically fallout from initial code-review.
The next three patches optimize and prepare libipt_DNAT.c as it will
serve as the source to merge into. Therefore patch 6 renames it to
libxt_DNAT.c and finally patches 7 and 8 merge the code.
As an extra, patch 9 "fixes" for service names in ranges by searching
the longest match.
Phil Sutter (9):
man: DNAT: Describe shifted port range feature
Revert "libipt_[SD]NAT: avoid false error about multiple destinations
specified"
extensions: ipt_DNAT: Merge v1 and v2 parsers
extensions: ipt_DNAT: Merge v1/v2 print/save code
extensions: ipt_DNAT: Combine xlate functions also
extensions: DNAT: Rename from libipt to libxt
extensions: Merge IPv4 and IPv6 DNAT targets
extensions: Merge REDIRECT into DNAT
extensions: DNAT: Support service names in all spots
extensions/GNUmakefile.in | 4 +-
extensions/libip6t_DNAT.c | 409 -----------------
extensions/libip6t_DNAT.txlate | 11 -
extensions/libip6t_REDIRECT.c | 170 -------
extensions/libip6t_REDIRECT.t | 6 -
extensions/libip6t_REDIRECT.txlate | 5 -
extensions/libip6t_SNAT.c | 9 +-
extensions/libipt_DNAT.c | 507 ---------------------
extensions/libipt_DNAT.t | 6 +
extensions/libipt_DNAT.txlate | 14 -
extensions/libipt_REDIRECT.c | 174 --------
extensions/libipt_REDIRECT.t | 6 -
extensions/libipt_REDIRECT.txlate | 5 -
extensions/libipt_SNAT.c | 3 -
extensions/libxt_DNAT.c | 685 +++++++++++++++++++++++++++++
extensions/libxt_DNAT.man | 5 +-
extensions/libxt_DNAT.txlate | 35 ++
extensions/libxt_REDIRECT.t | 11 +
extensions/libxt_REDIRECT.txlate | 17 +
19 files changed, 762 insertions(+), 1320 deletions(-)
delete mode 100644 extensions/libip6t_DNAT.c
delete mode 100644 extensions/libip6t_DNAT.txlate
delete mode 100644 extensions/libip6t_REDIRECT.c
delete mode 100644 extensions/libip6t_REDIRECT.t
delete mode 100644 extensions/libip6t_REDIRECT.txlate
delete mode 100644 extensions/libipt_DNAT.c
delete mode 100644 extensions/libipt_DNAT.txlate
delete mode 100644 extensions/libipt_REDIRECT.c
delete mode 100644 extensions/libipt_REDIRECT.t
delete mode 100644 extensions/libipt_REDIRECT.txlate
create mode 100644 extensions/libxt_DNAT.c
create mode 100644 extensions/libxt_DNAT.txlate
create mode 100644 extensions/libxt_REDIRECT.t
create mode 100644 extensions/libxt_REDIRECT.txlate
--
2.34.1
next reply other threads:[~2022-03-30 15:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 15:58 Phil Sutter [this message]
2022-03-30 15:58 ` [iptables PATCH 1/9] man: DNAT: Describe shifted port range feature Phil Sutter
2022-03-30 15:58 ` [iptables PATCH 2/9] Revert "libipt_[SD]NAT: avoid false error about multiple destinations specified" Phil Sutter
2022-03-30 15:58 ` [iptables PATCH 3/9] extensions: ipt_DNAT: Merge v1 and v2 parsers Phil Sutter
2022-03-30 15:58 ` [iptables PATCH 4/9] extensions: ipt_DNAT: Merge v1/v2 print/save code Phil Sutter
2022-03-30 15:58 ` [iptables PATCH 5/9] extensions: ipt_DNAT: Combine xlate functions also Phil Sutter
2022-03-30 15:58 ` [iptables PATCH 6/9] extensions: DNAT: Rename from libipt to libxt Phil Sutter
2022-03-30 15:58 ` [iptables PATCH 7/9] extensions: Merge IPv4 and IPv6 DNAT targets Phil Sutter
2022-03-30 15:58 ` [iptables PATCH 8/9] extensions: Merge REDIRECT into DNAT Phil Sutter
2022-03-30 15:58 ` [iptables PATCH 9/9] extensions: DNAT: Support service names in all spots Phil Sutter
2022-03-30 18:38 ` Jan Engelhardt
2022-03-30 20:57 ` Phil Sutter
2022-03-31 0:19 ` Jan Engelhardt
2022-03-31 10:04 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220330155851.13249-1-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).