From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH iptables-nft 0/3] remove escape_quotes support
Date: Thu, 24 Nov 2022 14:49:36 +0100 [thread overview]
Message-ID: <20221124134939.8245-1-fw@strlen.de> (raw)
Instead of escaping '"' for sake of the ability to do copy&paste from
xtables-translate without the shell removing those "" again,
unconditionally put the entire command line (except "nft") in ''.
This allows to get rid of all quotes logic. This logic was also
incomplete because some shells also try to make sense of raw { or [.
This change breaks xtables-translate '-R' mode for now, because
the '' are passed to nft -f without removal, but that should be
simple to fix. It might even be possible to avoid the shell-stap
used at the moment because we no longer need to undo any " escaping.
Florian Westphal (3):
xlate: get rid of escape_quotes
extensions: change expected output for new format
extensions: remove trailing spaces
extensions/generic.txlate | 56 ++++++++++++++--------------
extensions/libebt_dnat.txlate | 6 +--
extensions/libebt_ip.txlate | 18 ++++-----
extensions/libebt_ip6.txlate | 20 +++++-----
extensions/libebt_limit.txlate | 6 +--
extensions/libebt_log.c | 8 +---
extensions/libebt_log.txlate | 10 ++---
extensions/libebt_mark.txlate | 8 ++--
extensions/libebt_mark_m.txlate | 10 ++---
extensions/libebt_nflog.c | 8 +---
extensions/libebt_nflog.txlate | 8 ++--
extensions/libebt_pkttype.txlate | 14 +++----
extensions/libebt_snat.txlate | 4 +-
extensions/libebt_vlan.txlate | 8 ++--
extensions/libip6t_LOG.txlate | 6 +--
extensions/libip6t_MASQUERADE.txlate | 12 +++---
extensions/libip6t_REJECT.txlate | 6 +--
extensions/libip6t_SNAT.txlate | 8 ++--
extensions/libip6t_ah.txlate | 12 +++---
extensions/libip6t_frag.txlate | 12 +++---
extensions/libip6t_hbh.txlate | 4 +-
extensions/libip6t_hl.txlate | 4 +-
extensions/libip6t_icmp6.txlate | 6 +--
extensions/libip6t_mh.txlate | 4 +-
extensions/libip6t_rt.txlate | 10 ++---
extensions/libipt_LOG.txlate | 4 +-
extensions/libipt_MASQUERADE.txlate | 12 +++---
extensions/libipt_REJECT.txlate | 6 +--
extensions/libipt_SNAT.txlate | 10 ++---
extensions/libipt_ah.txlate | 6 +--
extensions/libipt_icmp.txlate | 8 ++--
extensions/libipt_realm.txlate | 8 ++--
extensions/libipt_ttl.txlate | 4 +-
extensions/libxt_AUDIT.txlate | 6 +--
extensions/libxt_CLASSIFY.txlate | 6 +--
extensions/libxt_CONNMARK.c | 2 +-
extensions/libxt_CONNMARK.txlate | 16 ++++----
extensions/libxt_DNAT.txlate | 24 ++++++------
extensions/libxt_DSCP.txlate | 4 +-
extensions/libxt_LOG.c | 8 +---
extensions/libxt_MARK.c | 16 ++++----
extensions/libxt_MARK.txlate | 18 ++++-----
extensions/libxt_NFLOG.c | 14 +++----
extensions/libxt_NFLOG.txlate | 10 ++---
extensions/libxt_NFQUEUE.c | 22 +++++------
extensions/libxt_NFQUEUE.txlate | 6 +--
extensions/libxt_NOTRACK.txlate | 2 +-
extensions/libxt_REDIRECT.txlate | 20 +++++-----
extensions/libxt_SYNPROXY.c | 12 +++---
extensions/libxt_SYNPROXY.txlate | 2 +-
extensions/libxt_TCPMSS.txlate | 4 +-
extensions/libxt_TEE.txlate | 8 ++--
extensions/libxt_TOS.txlate | 18 ++++-----
extensions/libxt_TRACE.txlate | 2 +-
extensions/libxt_addrtype.txlate | 8 ++--
extensions/libxt_cgroup.txlate | 4 +-
extensions/libxt_cluster.txlate | 18 ++++-----
extensions/libxt_comment.c | 7 +---
extensions/libxt_comment.txlate | 6 +--
extensions/libxt_connbytes.txlate | 10 ++---
extensions/libxt_connlabel.txlate | 4 +-
extensions/libxt_connlimit.txlate | 16 ++++----
extensions/libxt_connmark.txlate | 10 ++---
extensions/libxt_conntrack.txlate | 40 ++++++++++----------
extensions/libxt_cpu.txlate | 4 +-
extensions/libxt_dccp.txlate | 14 +++----
extensions/libxt_devgroup.txlate | 12 +++---
extensions/libxt_dscp.txlate | 4 +-
extensions/libxt_ecn.txlate | 20 +++++-----
extensions/libxt_esp.txlate | 8 ++--
extensions/libxt_hashlimit.txlate | 4 +-
extensions/libxt_helper.c | 8 +---
extensions/libxt_helper.txlate | 4 +-
extensions/libxt_ipcomp.txlate | 4 +-
extensions/libxt_iprange.txlate | 10 ++---
extensions/libxt_length.txlate | 8 ++--
extensions/libxt_limit.txlate | 6 +--
extensions/libxt_mac.txlate | 4 +-
extensions/libxt_mark.txlate | 4 +-
extensions/libxt_multiport.txlate | 10 ++---
extensions/libxt_owner.txlate | 6 +--
extensions/libxt_pkttype.txlate | 6 +--
extensions/libxt_policy.txlate | 4 +-
extensions/libxt_quota.txlate | 4 +-
extensions/libxt_rpfilter.txlate | 6 +--
extensions/libxt_sctp.txlate | 30 +++++++--------
extensions/libxt_statistic.txlate | 4 +-
extensions/libxt_tcp.txlate | 22 +++++------
extensions/libxt_tcpmss.txlate | 8 ++--
extensions/libxt_time.txlate | 18 ++++-----
extensions/libxt_udp.txlate | 8 ++--
include/xtables.h | 2 -
iptables/nft-bridge.c | 2 -
iptables/xtables-eb-translate.c | 7 ++--
iptables/xtables-translate.c | 14 +++++--
95 files changed, 456 insertions(+), 478 deletions(-)
--
2.37.4
next reply other threads:[~2022-11-24 13:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 13:49 Florian Westphal [this message]
2022-11-24 13:49 ` [PATCH iptables-nft 1/3] xlate: get rid of escape_quotes Florian Westphal
2022-11-24 14:05 ` Phil Sutter
2022-11-24 15:43 ` Florian Westphal
2022-11-24 13:49 ` [PATCH iptables-nft 2/3] extensions: change expected output for new format Florian Westphal
2022-11-24 13:49 ` [PATCH iptables-nft 3/3] extensions: remove trailing spaces Florian Westphal
2022-11-24 14:18 ` Phil Sutter
2022-11-24 15:44 ` Florian Westphal
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=20221124134939.8245-1-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.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).