From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH 00/12] Larger xtables-save review
Date: Sat, 20 Jul 2019 18:30:14 +0200 [thread overview]
Message-ID: <20190720163026.15410-1-phil@nwl.cc> (raw)
This series started as a fix to program names mentioned in *-save
outputs and ended in merging ebtables-save and arptables-save code into
xtables_save_main used by ip{6,}tables-nft-save.
The first patch is actually unrelated but was discovered when testing
counter output - depending on environment, ebtables-nft might segfault.
The second patch fixes option '-c' of ebtables-nft-save which enables
counter prefixes in dumped rules but failed to disable the classical
ebtables-style counters.
Patch three sorts program names quoted in output of any of the *-save
programs, patch four unifies the header/footer comments in the same. The
latter also drops the extra newline printed in ebtables- and
arptables-save output, so test scripts need adjustments beyond dropping
the new comment lines from output.
Patch five fixes the table compatibility check in ip{6,}tables-nft-save.
Patches six and eight to ten prepare for integrating arptables- and
ebtables-save into the xtables-save code.
Patch seven merely fixes a minor coding-style issue.
Patches eleven and twelve finally perform the actual merge.
Phil Sutter (12):
ebtables: Fix error message for invalid parameters
ebtables-save: Fix counter formatting
xtables-save: Use argv[0] as program name
xtables-save: Unify *-save header/footer comments
xtables-save: Fix table compatibility check
nft: Make nft_for_each_table() more versatile
xtables-save: Avoid mixed code and declarations
xtables-save: Pass optstring/longopts to xtables_save_main()
xtables-save: Make COMMIT line optional
xtables-save: Pass format flags to do_output()
arptables-save: Merge into xtables_save_main()
ebtables-save: Merge into xtables_save_main()
iptables/nft-bridge.c | 39 +--
iptables/nft.c | 6 +-
iptables/nft.h | 2 +-
.../arptables/0001-arptables-save-restore_0 | 7 +-
.../0002-arptables-restore-defaults_0 | 6 +-
.../arptables/0003-arptables-verbose-output_0 | 5 +-
.../ebtables/0002-ebtables-save-restore_0 | 4 +-
.../ebtables/0003-ebtables-restore-defaults_0 | 6 +-
.../testcases/ebtables/0004-save-counters_0 | 64 +++++
iptables/xtables-eb.c | 4 +-
iptables/xtables-save.c | 242 ++++--------------
11 files changed, 146 insertions(+), 239 deletions(-)
create mode 100755 iptables/tests/shell/testcases/ebtables/0004-save-counters_0
--
2.22.0
next reply other threads:[~2019-07-20 16:31 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-20 16:30 Phil Sutter [this message]
2019-07-20 16:30 ` [iptables PATCH 01/12] ebtables: Fix error message for invalid parameters Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 02/12] ebtables-save: Fix counter formatting Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 03/12] xtables-save: Use argv[0] as program name Phil Sutter
2019-07-20 16:52 ` Phil Sutter
2019-07-21 18:44 ` Pablo Neira Ayuso
2019-07-20 16:30 ` [iptables PATCH 04/12] xtables-save: Unify *-save header/footer comments Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 05/12] xtables-save: Fix table compatibility check Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 06/12] nft: Make nft_for_each_table() more versatile Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 07/12] xtables-save: Avoid mixed code and declarations Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 08/12] xtables-save: Pass optstring/longopts to xtables_save_main() Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 09/12] xtables-save: Make COMMIT line optional Phil Sutter
2019-07-20 19:29 ` Florian Westphal
2019-07-20 20:11 ` Phil Sutter
2019-07-20 20:13 ` Florian Westphal
2019-07-20 20:15 ` Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 10/12] xtables-save: Pass format flags to do_output() Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 11/12] arptables-save: Merge into xtables_save_main() Phil Sutter
2019-07-20 16:30 ` [iptables PATCH 12/12] ebtables-save: " Phil Sutter
2019-07-20 19:35 ` [iptables PATCH 00/12] Larger xtables-save review Florian Westphal
2019-07-21 18:56 ` Pablo Neira Ayuso
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=20190720163026.15410-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.