include: xtables: fix struct definitions grepability
PATCH 1/2 include: xtables: fix struct definitions grepability
Signed-off-by Pablo M. Bermudo Garay <[email protected]>
--- include/xtables.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
include/xtables.h +2 -4
@@ -220,8 +220,7 @@ struct xt_xlate_tg_params { };/* Include file for additions: new matches and targets. */ -struct xtables_match -{ +struct xtables_match {/* * ABI/API version this module requires. Must be first member, * as the rest of this struct may be subject to ABI changes.
@@ -298,8 +297,7 @@ struct xtables_matchunsigned int loaded;/* simulate loading so options are merged properly */ }; -struct xtables_target -{ +struct xtables_target {/* * ABI/API version this module requires. Must be first member, * as the rest of this struct may be subject to ABI changes.
Signature · 1 line
2.9.0
PATCH v2 2/2 xtables-translate: fix issue with quotes
Some translations included escaped quotes when they were called from nft:
$ sudo nft list ruleset
table ip mangle {
chain FORWARD {
type filter hook forward priority -150; policy accept;
ct helper \"ftp\" counter packets 0 bytes 0
^^ ^^
}
}This behavior is only correct when xlate functions are called from a xtables-translate command. This patch solves that issue using a new parameter (escape_quotes) in the xlate functions.
Signed-off-by Pablo M. Bermudo Garay <[email protected]>
--- extensions/libip6t_LOG.c | 8 ++++++-- extensions/libipt_LOG.c | 8 ++++++-- extensions/libxt_NFLOG.c | 13 +++++++++---- extensions/libxt_helper.c | 8 ++++++-- include/xtables.h | 2 ++ iptables/xtables-translate.c | 2 ++ 6 files changed, 31 insertions(+), 10 deletions(-)
extensions/libip6t_LOG.c +6 -2
@@ -190,8 +190,12 @@ static int LOG_xlate(struct xt_xlate *xl,unsigned int i =0 ;xt_xlate_add (xl,"log " ); -if (strcmp (loginfo->prefix,"" ) !=0 ) -xt_xlate_add (xl,"prefix \\\"%s\\\" " , loginfo->prefix); +if (strcmp (loginfo->prefix,"" ) !=0 ) { +if (params->escape_quotes) +xt_xlate_add (xl,"prefix \\\"%s\\\" " , loginfo->prefix); +else +xt_xlate_add (xl,"prefix \"%s\" " , loginfo->prefix); + }for (i =0 ; i <ARRAY_SIZE (ip6t_log_xlate_names); ++i) if (loginfo->level == ip6t_log_xlate_names[i].level &&
extensions/libipt_LOG.c +6 -2
@@ -190,8 +190,12 @@ static int LOG_xlate(struct xt_xlate *xl,unsigned int i =0 ;xt_xlate_add (xl,"log " ); -if (strcmp (loginfo->prefix,"" ) !=0 ) -xt_xlate_add (xl,"prefix \\\"%s\\\" " , loginfo->prefix); +if (strcmp (loginfo->prefix,"" ) !=0 ) { +if (params->escape_quotes) +xt_xlate_add (xl,"prefix \\\"%s\\\" " , loginfo->prefix); +else +xt_xlate_add (xl,"prefix \"%s\" " , loginfo->prefix); + }for (i =0 ; i <ARRAY_SIZE (ipt_log_xlate_names); ++i) if (loginfo->level != LOG_DEFAULT_LEVEL &&
extensions/libxt_NFLOG.c +9 -4
@@ -107,11 +107,16 @@ static void NFLOG_save(const void *ip, const struct xt_entry_target *target) }static void nflog_print_xlate (const struct xt_nflog_info *info, -struct xt_xlate *xl) +struct xt_xlate *xl,bool escape_quotes) {xt_xlate_add (xl,"log " ); -if (info->prefix[0 ] !='\0' ) -xt_xlate_add (xl,"prefix \\\"%s\\\" " , info->prefix); +if (info->prefix[0 ] !='\0' ) { +if (escape_quotes) +xt_xlate_add (xl,"prefix \\\"%s\\\" " , info->prefix); +else +xt_xlate_add (xl,"prefix \"%s\" " , info->prefix); + + }if (info->flags &XT_NFLOG_F_COPY_LEN )xt_xlate_add (xl,"snaplen %u " , info->len);if (info->threshold !=XT_NFLOG_DEFAULT_THRESHOLD )
@@ -125,7 +130,7 @@ static int NFLOG_xlate(struct xt_xlate *xl,const struct xt_nflog_info *info = (struct xt_nflog_info *)params->target->data; -nflog_print_xlate (info, xl); +nflog_print_xlate (info, xl, params->escape_quotes);return 1 ; }
extensions/libxt_helper.c +6 -2
@@ -50,8 +50,12 @@ static int helper_xlate(struct xt_xlate *xl, {const struct xt_helper_info *info = (const void *)params->match->data; -xt_xlate_add (xl,"ct helper%s \\\"%s\\\"" , - info->invert ?" !=" :"" , info->name); +if (params->escape_quotes) +xt_xlate_add (xl,"ct helper%s \\\"%s\\\"" , + info->invert ?" !=" :"" , info->name); +else +xt_xlate_add (xl,"ct helper%s \"%s\"" , + info->invert ?" !=" :"" , info->name);return 1 ; }
include/xtables.h +2 -0
@@ -211,12 +211,14 @@ struct xt_xlate_mt_params {const void *ip;const struct xt_entry_match *match;int numeric; +bool escape_quotes; };struct xt_xlate_tg_params {const void *ip;const struct xt_entry_target *target;int numeric; +bool escape_quotes; };/* Include file for additions: new matches and targets. */
iptables/xtables-translate.c +2 -0
@@ -53,6 +53,7 @@ int xlate_action(const struct iptables_command_state *cs, bool goto_set, .ip = (const void *)&cs->fw, .target = cs->target->t, .numeric = numeric, + .escape_quotes = true, }; ret = cs->target->xlate (xl, ¶ms); }
@@ -79,6 +80,7 @@ int xlate_matches(const struct iptables_command_state *cs, struct xt_xlate *xl) .ip = (const void *)&cs->fw, .match = matchp->match->m, .numeric = numeric, + .escape_quotes = true, };if (!matchp->match->xlate)
Signature · 1 line
2.9.0
Re: [PATCH iptables v2 2/2] xtables-translate: fix issue with quotes
Quoted 12 lines · Pablo M. Bermudo Garay
Some translations included escaped quotes when they were called from nft:
$ sudo nft list ruleset table ip mangle { chain FORWARD { type filter hook forward priority -150; policy accept; ct helper \"ftp\" counter packets 0 bytes 0 ^^ ^^ } }
Quoted 3 lines
This behavior is only correct when xlate functions are called from a xtables-translate command. This patch solves that issue using a new parameter (
escape_quotes) in the xlate functions.
Applied, thanks Pablo.
Applied, thanks.