comment: Add translation to nft
PATCH 1/1 comment: Add translation to nft
Add translation for match comment to nftables.
This patch also adds the relevant infrastructure for carrying out the translation.
Example:
$ sudo iptables-translate -A INPUT -s 192.168.0.0 -m comment --comment "A privatized IP block" nft add rule ip filter INPUT ip saddr 192.168.0.0 counter comment \"A privatized IP block\"
Signed-off-by Shivani Bhardwaj <[email protected]>
--- extensions/libxt_comment.c | 13 +++++++++++++ include/xtables.h | 1 + iptables/nft-ipv4.c | 6 ++++++ iptables/nft-ipv6.c | 6 ++++++ libxtables/xtables.c | 5 +++++ 5 files changed, 31 insertions(+)
extensions/libxt_comment.c +13 -0
@@ -48,6 +48,18 @@ comment_save(const void *ip, const struct xt_entry_match *match)xtables_save_string (commentinfo->comment); } +static int +comment_xlate (const struct xt_entry_match *match, +struct xt_xlate *xl,int numeric) +{ +struct xt_comment_info *commentinfo = (void *)match->data; + + commentinfo->comment[XT_MAX_COMMENT_LEN -1 ] ='\0' ; +xt_xlate_add_comment (xl, commentinfo->comment); + +return 1 ; +} +static struct xtables_match comment_match = { .family =NFPROTO_UNSPEC , .name ="comment" ,
@@ -59,6 +71,7 @@ static struct xtables_match comment_match = { .save = comment_save, .x6_parse = xtables_option_parse, .x6_options = comment_opts, + .xlate = comment_xlate, };void _init (void )
include/xtables.h +1 -0
@@ -574,6 +574,7 @@ struct xt_xlate *xt_xlate_alloc(int size);void xt_xlate_free (struct xt_xlate *xl);void xt_xlate_add (struct xt_xlate *xl,const char *fmt, ...);void xt_xlate_add_comment (struct xt_xlate *xl,const char *comment); +const char *xt_xlate_get_comment (struct xt_xlate *xl);const char *xt_xlate_get (struct xt_xlate *xl);#ifdef XTABLES_INTERNAL
iptables/nft-ipv4.c +6 -0
@@ -433,6 +433,7 @@ static int nft_ipv4_xlate(const void *data, struct xt_xlate *xl) {const struct iptables_command_state *cs = data;int ret; +const char *comment;if (cs->fw.ip.iniface[0 ] !='\0' ) { xt_xlate_add(xl, "iifname %s%s ",
@@ -484,6 +485,11 @@ static int nft_ipv4_xlate(const void *data, struct xt_xlate *xl)/* Always add counters per rule, as in iptables */ xt_xlate_add (xl,"counter " ); + comment =xt_xlate_get_comment (xl); + +if (strcmp (comment,"" )) +xt_xlate_add (xl,"comment \\\"%s\\\" " , comment); + ret =xlate_action (cs, !!(cs->fw.ip.flags &IPT_F_GOTO ), xl);return ret;
iptables/nft-ipv6.c +6 -0
@@ -393,6 +393,7 @@ static int nft_ipv6_xlate(const void *data, struct xt_xlate *xl) {const struct iptables_command_state *cs = data;int ret; +const char *comment;if (cs->fw6.ipv6.iniface[0 ] !='\0' ) { xt_xlate_add(xl, "iifname %s%s ",
@@ -435,6 +436,11 @@ static int nft_ipv6_xlate(const void *data, struct xt_xlate *xl)/* Always add counters per rule, as in iptables */ xt_xlate_add (xl,"counter " ); + comment =xt_xlate_get_comment (xl); + +if (strcmp (comment,"" )) +xt_xlate_add (xl,"comment \\\"%s\\\" " , comment); + ret =xlate_action (cs, !!(cs->fw6.ipv6.flags &IP6T_F_GOTO ), xl);return ret;
libxtables/xtables.c +5 -0
@@ -2045,6 +2045,11 @@ void xt_xlate_add_comment(struct xt_xlate *xl, const char *comment) xl->comment[NFT_USERDATA_MAXLEN -1 ] ='\0' ; } +const char *xt_xlate_get_comment (struct xt_xlate *xl) +{ +return xl->comment; +} +const char *xt_xlate_get (struct xt_xlate *xl) {return xl->buf.data;
Signature · 1 line
1.9.1
Pablo Neira Ayuso
maintainerQuoted 8 lines · Shivani Bhardwaj
Add translation for match comment to nftables.
This patch also adds the relevant infrastructure for carrying out the translation.Example:
$ sudo iptables-translate -A INPUT -s 192.168.0.0 -m comment --comment "A privatized IP block" nft add rule ip filter INPUT ip saddr 192.168.0.0 counter comment \"A privatized IP block\"
Applied with some changes, see final commit pushed upstream for updates.
Thanks.