From: Pablo Neira Ayuso <pablo@netfilter.org>
To: "Pablo M. Bermudo Garay" <pablombg@gmail.com>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH iptables v2 2/2] xtables-translate-restore: do not escape quotes
Date: Tue, 23 Aug 2016 14:07:50 +0200 [thread overview]
Message-ID: <20160823120750.GA27760@salvia> (raw)
In-Reply-To: <20160822105615.32483-2-pablombg@gmail.com>
On Mon, Aug 22, 2016 at 12:56:15PM +0200, Pablo M. Bermudo Garay wrote:
> If quotes are escaped, nft -f is unable to parse and load the translated
> ruleset.
>
> Signed-off-by: Pablo M. Bermudo Garay <pablombg@gmail.com>
> ---
>
> Changes in v2:
> - Do not use strcmp against 'program_name' global, propagate 'bool restore'
> argument instead.
>
> iptables/nft-ipv4.c | 6 +++---
> iptables/nft-ipv6.c | 7 ++++---
> iptables/nft-shared.h | 2 +-
> iptables/nft.h | 5 +++--
> iptables/xtables-translate.c | 28 ++++++++++++++++++----------
> 5 files changed, 29 insertions(+), 19 deletions(-)
>
> diff --git a/iptables/nft-ipv4.c b/iptables/nft-ipv4.c
> index 295dd42..362036c 100644
> --- a/iptables/nft-ipv4.c
> +++ b/iptables/nft-ipv4.c
> @@ -438,7 +438,7 @@ static void nft_ipv4_save_counters(const void *data)
> save_counters(cs->counters.pcnt, cs->counters.bcnt);
> }
>
> -static int nft_ipv4_xlate(const void *data, struct xt_xlate *xl)
> +static int nft_ipv4_xlate(const void *data, struct xt_xlate *xl, bool restore)
You better place this 'restore' as a field in iptables_command_state?
This would require a bit of changes in iptables and ip6tables, but
that sounds reasonable to me.
next prev parent reply other threads:[~2016-08-23 12:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-22 10:56 [PATCH iptables v2 1/2] xtables-translate: add escape_quotes option to comment_xlate Pablo M. Bermudo Garay
2016-08-22 10:56 ` [PATCH iptables v2 2/2] xtables-translate-restore: do not escape quotes Pablo M. Bermudo Garay
2016-08-23 12:07 ` Pablo Neira Ayuso [this message]
2016-08-23 12:04 ` [PATCH iptables v2 1/2] xtables-translate: add escape_quotes option to comment_xlate 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=20160823120750.GA27760@salvia \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablombg@gmail.com \
/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).