nft-shared: adds save_matches_and_target
PATCH v2 1/1 nft-shared: adds save_matches_and_target
This patch permits to save matches and target for ip/ip6/eb family, required for xtables-events.
Also, generalizes nft_rule_print_save to be reused for all protocol families.
--- iptables/nft-ipv4.c | 7 +++++-- iptables/nft-ipv6.c | 7 +++++-- iptables/nft-shared.c | 35 +++++++++++++++++++++++++++++++++++ iptables/nft-shared.h | 6 +++++- iptables/nft.c | 33 +++------------------------------ iptables/nft.h | 2 +- 6 files changed, 54 insertions(+), 36 deletions(-)
iptables/nft-ipv4.c +5 -2
@@ -309,9 +309,11 @@ static void save_ipv4_addr(char letter, const struct in_addr *addr, mask_to_str(mask)); } -static uint8_t nft_ipv4_save_firewall (const struct iptables_command_state *cs, +static void nft_ipv4_save_firewall (const void *data,unsigned int format) { +const struct iptables_command_state *cs = data; + save_firewall_details(cs, cs->fw.ip.invflags, cs->fw.ip.proto, cs->fw.ip.iniface, cs->fw.ip.iniface_mask, cs->fw.ip.outiface, cs->fw.ip.outiface_mask,
@@ -328,7 +330,8 @@ static uint8_t nft_ipv4_save_firewall(const struct iptables_command_state *cs,save_ipv4_addr ('d' , &cs->fw.ip.dst, cs->fw.ip.dmsk.s_addr, cs->fw.ip.invflags &IPT_INV_DSTIP ); -return cs->fw.ip.flags; +save_matches_and_target (cs->matches, cs->target, cs->jumpto, + cs->fw.ip.flags, &cs); } static void nft_ipv4_proto_parse(struct iptables_command_state *cs,
iptables/nft-ipv6.c +5 -2
@@ -218,9 +218,11 @@ static void save_ipv6_addr(char letter, const struct in6_addr *addr,printf ("%s-%c %s " , invert ?"! " :"" , letter, addr_str); } -static uint8_t nft_ipv6_save_firewall (const struct iptables_command_state *cs, +static void nft_ipv6_save_firewall (const void *data,unsigned int format) { +const struct iptables_command_state *cs = data; + save_firewall_details(cs, cs->fw6.ipv6.invflags, cs->fw6.ipv6.proto, cs->fw6.ipv6.iniface, cs->fw6.ipv6.iniface_mask, cs->fw6.ipv6.outiface, cs->fw6.ipv6.outiface_mask,
@@ -231,7 +233,8 @@ static uint8_t nft_ipv6_save_firewall(const struct iptables_command_state *cs,save_ipv6_addr ('d' , &cs->fw6.ipv6.dst, cs->fw6.ipv6.invflags &IPT_INV_DSTIP ); -return cs->fw6.ipv6.flags; +save_matches_and_target (cs->matches, cs->target, cs->jumpto, + cs->fw6.ipv6.flags, &cs); }/* These are invalid numbers as upper layer protocol */
iptables/nft-shared.c +35 -0
@@ -621,6 +621,41 @@ void save_firewall_details(const struct iptables_command_state *cs, } } +void save_matches_and_target (struct xtables_rule_match *m, +struct xtables_target *target, +const char *jumpto, +uint8_t flags,void *fw) +{ +struct xtables_rule_match *matchp; + +for (matchp = m; matchp; matchp = matchp->next) { +if (matchp->match->alias) { +printf ("-m %s" , + matchp->match->alias (matchp->match->m)); + }else +printf ("-m %s" , matchp->match->name); + +if (matchp->match->save !=NULL ) { +/* cs->fw union makes the trick */ + matchp->match->save (&fw, matchp->match->m); + } +printf (" " ); + } + +if (target !=NULL ) { +if (target->alias) { +printf ("-j %s" , target->alias (target->t)); + }else +printf ("-j %s" , jumpto); + +if (target->save !=NULL ) + target->save (fw, target->t); + }else if (strlen (jumpto) >0 ) +printf ("-%c %s" , flags &IPT_F_GOTO ?'g' :'j' , jumpto); + +printf ("\n" ); +} +void print_matches_and_target (struct iptables_command_state *cs,unsigned int format) {
iptables/nft-shared.h +5 -1
@@ -49,7 +49,7 @@ struct nft_family_ops {void (*parse_immediate)(const char *jumpto,bool nft_goto,void *data);void (*print_firewall)(struct nft_rule *r,unsigned int num,unsigned int format); -uint8_t (*save_firewall)(const struct iptables_command_state *cs, +void (*save_firewall)(const void *data,unsigned int format);void (*proto_parse)(struct iptables_command_state *cs,struct xtables_args *args);
@@ -118,6 +118,10 @@ void save_firewall_details(const struct iptables_command_state *cs,const char *outiface, unsigned const char *outiface_mask, unsigned int format); +void save_matches_and_target (struct xtables_rule_match *m, +struct xtables_target *target, +const char *jumpto, +uint8_t flags,void *fw);struct nft_family_ops *nft_family_ops_lookup (int family);
iptables/nft.c +3 -30
@@ -1038,15 +1038,13 @@ nft_rule_append(struct nft_handle *h, const char *chain, const char *table, }void -nft_rule_print_save (const struct iptables_command_state *cs, +nft_rule_print_save (const void *data,struct nft_rule *r,enum nft_rule_print type,unsigned int format) {const char *chain =nft_rule_attr_get_str (r,NFT_RULE_ATTR_CHAIN );int family =nft_rule_attr_get_u8 (r,NFT_RULE_ATTR_FAMILY ); -struct xtables_rule_match *matchp;struct nft_family_ops *ops; -int ip_flags =0 ;/* print chain name */ switch (type) {
@@ -1059,35 +1057,10 @@ nft_rule_print_save(const struct iptables_command_state *cs, } ops =nft_family_ops_lookup (family); - ip_flags = ops->save_firewall (cs, format); - -for (matchp = cs->matches; matchp; matchp = matchp->next) { -if (matchp->match->alias) { -printf ("-m %s" , - matchp->match->alias (matchp->match->m)); - }else -printf ("-m %s" , matchp->match->name); - -if (matchp->match->save !=NULL ) { -/* cs->fw union makes the trick */ - matchp->match->save (&cs->fw, matchp->match->m); - } -printf (" " ); - } -if (cs->target !=NULL ) { -if (cs->target->alias) { -printf ("-j %s" , cs->target->alias (cs->target->t)); - }else -printf ("-j %s" , cs->jumpto); +if (ops->save_firewall) + ops->save_firewall (data, format); -if (cs->target->save !=NULL ) - cs->target->save (&cs->fw, cs->target->t); - }else if (strlen (cs->jumpto) >0 ) -printf ("-%c %s" , ip_flags &IPT_F_GOTO ?'g' :'j' , - cs->jumpto); - -printf ("\n" ); }static int nft_chain_list_cb (const struct nlmsghdr *nlh,void *data)
iptables/nft.h +1 -1
@@ -115,7 +115,7 @@ enum nft_rule_print { NFT_RULE_DEL, }; -void nft_rule_print_save (const struct iptables_command_state *cs, +void nft_rule_print_save (const void *data,struct nft_rule *r,enum nft_rule_print type,unsigned int format);
Signature · 1 line
1.8.1.5
PATCH v2 1/1 xtables-events: prints arp rules
This patch permits to print arp rules,
avoiding the segfault that you got currently.
--- iptables/xtables-events.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
iptables/xtables-events.c +12 -7
@@ -59,7 +59,10 @@ static bool counters;static int rule_cb (const struct nlmsghdr *nlh,int type) {struct iptables_command_state cs = {}; +struct arpt_entry fw_arp = {};struct nft_rule *r; +void *fw =NULL ; +uint8_t family; r =nft_rule_alloc ();if (r ==NULL ) {
@@ -72,21 +75,23 @@ static int rule_cb(const struct nlmsghdr *nlh, int type) goto err_free; } -nft_rule_to_iptables_command_state (r, &cs); - -switch (nft_rule_attr_get_u8 (r,NFT_RULE_ATTR_FAMILY )) { + family =nft_rule_attr_get_u8 (r,NFT_RULE_ATTR_FAMILY ); +switch (family) {case AF_INET : -printf ("-4 " ); -break ;case AF_INET6 : -printf ("-6 " ); +printf ("-%c " , family ==AF_INET ?'4' :'6' ); +nft_rule_to_iptables_command_state (r, &cs); + fw = &cs;break ; +case NFPROTO_ARP : +nft_rule_to_arpt_entry (r, &fw_arp); + fw = &fw_arp;default :break ; } -nft_rule_print_save (&cs, r, +nft_rule_print_save (fw, r, type ==NFT_MSG_NEWRULE ?NFT_RULE_APPEND :NFT_RULE_DEL , counters ?0 :FMT_NOCOUNTS );
Signature · 1 line
1.8.1.5
Pablo Neira Ayuso
maintainerRe: [PATCH v2] xtables-events: prints arp rules
Quoted 2 lines · Giuseppe Longo
This patch permits to print arp rules,
avoiding the segfault that you got currently.
There is no .save_firewall hook for nft-arp, so this does not print anything. Did you forget to include it in your patch?
More comments below.
Quoted 31 lines
Signed-off-by Giuseppe Longo <[email protected]>--- iptables/xtables-events.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)iptables/xtables-events.c +5
-4@@ -59,7 +59,10 @@ static bool counters;static int rule_cb (const struct nlmsghdr *nlh,int type) {struct iptables_command_state cs = {}; +struct arpt_entry fw_arp = {};struct nft_rule *r; +void *fw =NULL ; +uint8_t family; r =nft_rule_alloc ();if (r ==NULL ) {@@ -72,21 +75,23 @@ static int rule_cb(const struct nlmsghdr *nlh, int type) goto err_free; } -nft_rule_to_iptables_command_state (r, &cs); - -switch (nft_rule_attr_get_u8 (r,NFT_RULE_ATTR_FAMILY )) { + family =nft_rule_attr_get_u8 (r,NFT_RULE_ATTR_FAMILY ); +switch (family) {case AF_INET : -printf ("-4 " );
iptables/xtables-events.c static int rule_cb(const struct nlmsghdr *nlh, int type) · line 88
Quoted 10 lines
iptables/xtables-events.c +6
-2-break ;case AF_INET6 : -printf ("-6 " ); +printf ("-%c " , family ==AF_INET ?'4' :'6' ); +nft_rule_to_iptables_command_state (r, &cs); + fw = &cs;break ; +case NFPROTO_ARP : +nft_rule_to_arpt_entry (r, &fw_arp); + fw = &fw_arp;
missing break; here.
iptables/xtables-events.c static int rule_cb(const struct nlmsghdr *nlh, int type) · line 90
Quoted 2 lines
iptables/xtables-events.c +0
-0default :break ;
Instead of this break;, please use:
goto err_free;
so it just skips nft_rule_print_save for unknown families.
Quoted 15 lines
iptables/xtables-events.c +1
-1} -nft_rule_print_save (&cs, r, +nft_rule_print_save (fw, r, type ==NFT_MSG_NEWRULE ?NFT_RULE_APPEND :NFT_RULE_DEL , counters ?0 :FMT_NOCOUNTS );Signature · 6 lines
1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso
maintainerQuoted 20 lines · Giuseppe Longo
This patch permits to save matches and target for ip/ip6/eb family, required for xtables-events.
Also, generalizes
nft_rule_print_saveto be reused for all protocol families.Signed-off-by Giuseppe Longo <[email protected]>--- iptables/nft-ipv4.c | 7 +++++-- iptables/nft-ipv6.c | 7 +++++-- iptables/nft-shared.c | 35 +++++++++++++++++++++++++++++++++++ iptables/nft-shared.h | 6 +++++- iptables/nft.c | 33 +++------------------------------ iptables/nft.h | 2 +- 6 files changed, 54 insertions(+), 36 deletions(-)iptables/nft-ipv4.c +0
-0
iptables/nft-ipv4.c static void save_ipv4_addr(char letter, const struct in_addr *addr, · line 313
Quoted 6 lines
iptables/nft-ipv4.c +1
-1@@ -309,9 +309,11 @@ static void save_ipv4_addr(char letter, const struct in_addr *addr, mask_to_str(mask)); } -static uint8_t nft_ipv4_save_firewall (const struct iptables_command_state *cs, +static void nft_ipv4_save_firewall (const void *data,unsigned int format)
This fits in 80-chars line, no need to break it. I have fixed this here.
iptables/nft-ipv4.c static uint8_t nft_ipv4_save_firewall(const struct iptables_command_state *cs, · line 334
Quoted 13 lines
iptables/nft-ipv4.c +4
-1{ +const struct iptables_command_state *cs = data; + save_firewall_details(cs, cs->fw.ip.invflags, cs->fw.ip.proto, cs->fw.ip.iniface, cs->fw.ip.iniface_mask, cs->fw.ip.outiface, cs->fw.ip.outiface_mask,@@ -328,7 +330,8 @@ static uint8_t nft_ipv4_save_firewall(const struct iptables_command_state *cs,save_ipv4_addr ('d' , &cs->fw.ip.dst, cs->fw.ip.dmsk.s_addr, cs->fw.ip.invflags &IPT_INV_DSTIP ); -return cs->fw.ip.flags; +save_matches_and_target (cs->matches, cs->target, cs->jumpto, + cs->fw.ip.flags, &cs);
You're passing &cs here... (continues below)
Quoted 35 lines
iptables/nft-ipv4.c +0
-0} static void nft_ipv4_proto_parse(struct iptables_command_state *cs,iptables/nft-ipv6.c +5
-2@@ -218,9 +218,11 @@ static void save_ipv6_addr(char letter, const struct in6_addr *addr,printf ("%s-%c %s " , invert ?"! " :"" , letter, addr_str); } -static uint8_t nft_ipv6_save_firewall (const struct iptables_command_state *cs, +static void nft_ipv6_save_firewall (const void *data,unsigned int format) { +const struct iptables_command_state *cs = data; + save_firewall_details(cs, cs->fw6.ipv6.invflags, cs->fw6.ipv6.proto, cs->fw6.ipv6.iniface, cs->fw6.ipv6.iniface_mask, cs->fw6.ipv6.outiface, cs->fw6.ipv6.outiface_mask,@@ -231,7 +233,8 @@ static uint8_t nft_ipv6_save_firewall(const struct iptables_command_state *cs,save_ipv6_addr ('d' , &cs->fw6.ipv6.dst, cs->fw6.ipv6.invflags &IPT_INV_DSTIP ); -return cs->fw6.ipv6.flags; +save_matches_and_target (cs->matches, cs->target, cs->jumpto, + cs->fw6.ipv6.flags, &cs); }/* These are invalid numbers as upper layer protocol */ iptables/nft-shared.c +0
-0
iptables/nft-shared.c void save_firewall_details(const struct iptables_command_state *cs, · line 627
Quoted 7 lines
iptables/nft-shared.c +4
-0@@ -621,6 +621,41 @@ void save_firewall_details(const struct iptables_command_state *cs, } } +void save_matches_and_target (struct xtables_rule_match *m, +struct xtables_target *target, +const char *jumpto, +uint8_t flags,void *fw)
But save_matches_and_target takes a void *fw. Beware with pointer handling, I guess you did that to resolve a compilation warning but that was not the way to make.
I have fixed this as well.
Quoted 17 lines
iptables/nft-shared.c +17
-0+{ +struct xtables_rule_match *matchp; + +for (matchp = m; matchp; matchp = matchp->next) { +if (matchp->match->alias) { +printf ("-m %s" , + matchp->match->alias (matchp->match->m)); + }else +printf ("-m %s" , matchp->match->name); + +if (matchp->match->save !=NULL ) { +/* cs->fw union makes the trick */ + matchp->match->save (&fw, matchp->match->m); + } +printf (" " ); + } +
iptables/nft-shared.c void save_firewall_details(const struct iptables_command_state *cs, · line 654
Quoted 10 lines
iptables/nft-shared.c +10
-0+if (target !=NULL ) { +if (target->alias) { +printf ("-j %s" , target->alias (target->t)); + }else +printf ("-j %s" , jumpto); + +if (target->save !=NULL ) + target->save (fw, target->t); + }else if (strlen (jumpto) >0 ) +printf ("-%c %s" , flags &IPT_F_GOTO ?'g' :'j' , jumpto);
Not related to your patch. We've been doing wrong flags handling, I'll also push the patch attached.
Quoted 12 lines
iptables/nft-shared.c +4
-0+ +printf ("\n" ); +} +void print_matches_and_target (struct iptables_command_state *cs,unsigned int format) {iptables/nft-shared.h +0
-0
iptables/nft-shared.h struct nft_family_ops { · line 53
Quoted 6 lines
iptables/nft-shared.h +1
-1@@ -49,7 +49,7 @@ struct nft_family_ops {void (*parse_immediate)(const char *jumpto,bool nft_goto,void *data);void (*print_firewall)(struct nft_rule *r,unsigned int num,unsigned int format); -uint8_t (*save_firewall)(const struct iptables_command_state *cs, +void (*save_firewall)(const void *data,unsigned int format);
Please, next time also make sure coding you adjust the line above, so we don't need to adjust it later on with coding style cleanup patches.
As said, I have fixes these things and pushed this patch to master. Please, put a bit more care next time, thanks.
Quoted 1 line
From
c2f26fc174da216f6ebb93349a5bd9e66bc070b3Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <[email protected]>
Date: Tue, 11 Feb 2014 13:31:12 +0100
Subject: [PATCH iptables-compat] nft-compat: fix IP6T_F_GOTO flag handling
IPT_F_GOTO and IP6T_F_GOTO don't overlap, so this need special handling to avoid misinterpretations.
--- iptables/nft-ipv4.c | 8 +++++++- iptables/nft-ipv6.c | 14 +++++++++----- iptables/nft-shared.c | 5 +---- iptables/nft.c | 4 ++-- iptables/nft.h | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-)
iptables/nft-ipv4.c +7 -1
@@ -76,7 +76,7 @@ static int nft_ipv4_add(struct nft_rule *r, void *data)if (add_counters (r, cs->counters.pcnt, cs->counters.bcnt) <0 )return -1 ; -return add_action (r, cs, cs->fw.ip.flags); +return add_action (r, cs, !!(cs->fw.ip.flags &IPT_F_GOTO )); } static bool nft_ipv4_is_same(const void *data_a,
@@ -331,6 +331,12 @@ static void nft_ipv4_save_firewall(const void *data, unsigned int format)save_matches_and_target (cs->matches, cs->target, cs->jumpto, cs->fw.ip.flags, cs); + +if (cs->target ==NULL &&strlen (cs->jumpto) >0 ) { +printf ("-%c %s" , cs->fw.ip.flags &IPT_F_GOTO ?'g' :'j' , + cs->jumpto); + } +printf ("\n" ); } static void nft_ipv4_proto_parse(struct iptables_command_state *cs,
iptables/nft-ipv6.c +9 -5
@@ -59,7 +59,7 @@ static int nft_ipv6_add(struct nft_rule *r, void *data)if (add_counters (r, cs->counters.pcnt, cs->counters.bcnt) <0 )return -1 ; -return add_action (r, cs, cs->fw6.ipv6.flags); +return add_action (r, cs, !!(cs->fw6.ipv6.flags &IP6T_F_GOTO )); } static bool nft_ipv6_is_same(const void *data_a,
@@ -138,7 +138,7 @@ static void nft_ipv6_parse_immediate(const char *jumpto, bool nft_goto, cs->jumpto = jumpto;if (nft_goto) - cs->fw6.ipv6.flags |=IPT_F_GOTO ; + cs->fw6.ipv6.flags |=IP6T_F_GOTO ; } static void print_ipv6_addr(const struct iptables_command_state *cs,
@@ -195,10 +195,8 @@ static void nft_ipv6_print_firewall(struct nft_rule *r, unsigned int num,if (format &FMT_NOTABLE )fputs (" " , stdout); -#ifdef IPT_F_GOTO -if (cs.fw6.ipv6.flags &IPT_F_GOTO ) +if (cs.fw6.ipv6.flags &IP6T_F_GOTO )printf ("[goto] " ); -#endif print_matches_and_target (&cs, format);
@@ -234,6 +232,12 @@ static void nft_ipv6_save_firewall(const void *data, unsigned int format)save_matches_and_target (cs->matches, cs->target, cs->jumpto, cs->fw6.ipv6.flags, cs); + +if (cs->target ==NULL &&strlen (cs->jumpto) >0 ) { +printf ("-%c %s" , cs->fw6.ipv6.flags &IP6T_F_GOTO ?'g' :'j' , + cs->jumpto); + } +printf ("\n" ); }/* These are invalid numbers as upper layer protocol */
iptables/nft-shared.c +1 -4
@@ -648,10 +648,7 @@ void save_matches_and_target(struct xtables_rule_match *m,if (target->save !=NULL ) target->save (fw, target->t); - }else if (strlen (jumpto) >0 ) -printf ("-%c %s" , flags &IPT_F_GOTO ?'g' :'j' , jumpto); - -printf ("\n" ); + } } void print_matches_and_target(struct iptables_command_state *cs,
iptables/nft.c +2 -2
@@ -864,7 +864,7 @@ int add_verdict(struct nft_rule *r, int verdict) }int add_action (struct nft_rule *r,struct iptables_command_state *cs, -int ip_flags) +bool goto_set) {int ret =0 ;
@@ -881,7 +881,7 @@ int add_action(struct nft_rule *r, struct iptables_command_state *cs, ret =add_target (r, cs->target->t); }else if (strlen (cs->jumpto) >0 ) {/* Not standard, then it's a go / jump to chain */ -if (ip_flags &IPT_F_GOTO ) +if (goto_set) ret =add_jumpto (r, cs->jumpto,NFT_GOTO );else ret =add_jumpto (r, cs->jumpto,NFT_JUMP );
iptables/nft.h +1 -1
@@ -107,7 +107,7 @@ int add_verdict(struct nft_rule *r, int verdict);int add_match (struct nft_rule *r,struct xt_entry_match *m);int add_target (struct nft_rule *r,struct xt_entry_target *t);int add_jumpto (struct nft_rule *r,const char *name,int verdict); -int add_action (struct nft_rule *r,struct iptables_command_state *cs,int ip_flags); +int add_action (struct nft_rule *r,struct iptables_command_state *cs,bool goto_set);enum nft_rule_print {NFT_RULE_APPEND ,
Signature · 1 line
1.7.10.4