src/rule: Removed mandatory attribute printing in rules
PATCH 1/2 src/rule: Removed mandatory attribute printing in rules
From: Álvaro Neira Ayuso <[email protected]>
Before this patch, the program tried to print some attribute that maybe the user hasn't defined for printing. We can't assume that the user want to print some attribute that we have put mandatory in the rules. Example:
Before this patch, it's mandatory have a rule with family and this is the output:
{"rule":{"family":"ip","handle":4...
<rule><family>ip</family><handle>4</handle>...
Now, we can print rule without some attribute:
{"rule":{"handle":4...
<rule><handle>4</handle>...
--- src/rule.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 13 deletions(-)
src/rule.c +79 -13
@@ -775,12 +775,32 @@ static int nft_rule_snprintf_json(char *buf, size_t size, struct nft_rule *r,int ret, len = size, offset =0 ;struct nft_rule_expr *expr; - ret =snprintf (buf, len,"{\"rule\":{\"family\":\"%s\",\"table\":\"%s\"," -"\"chain\":\"%s\",\"handle\":%llu," , -nft_family2str (r->family), r->table, r->chain, - (unsigned long long )r->handle); + ret =snprintf (buf, len,"{\"rule\":{" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +if (r->flags & (1 <<NFT_RULE_ATTR_FAMILY )) { + ret =snprintf (buf+offset, len,"\"family\":\"%s\"," , +nft_family2str (r->family)); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +if (r->flags & (1 <<NFT_RULE_ATTR_TABLE )) { + ret =snprintf (buf+offset, len,"\"table\":\"%s\"," , + r->table); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +if (r->flags & (1 <<NFT_RULE_ATTR_CHAIN )) { + ret =snprintf (buf+offset, len,"\"chain\":\"%s\"," , + r->chain); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } +if (r->flags & (1 <<NFT_RULE_ATTR_HANDLE )) { + ret =snprintf (buf+offset, len,"\"handle\":%llu," , + (unsigned long long )r->handle); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } +if (r->flags & (1 <<NFT_RULE_ATTR_COMPAT_PROTO ) || r->flags & (1 <<NFT_RULE_ATTR_COMPAT_FLAGS )) { ret = snprintf(buf+offset, len, "\"compat_flags\":%u,"
@@ -824,13 +844,32 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,int ret, len = size, offset =0 ;struct nft_rule_expr *expr; - ret =snprintf (buf, len,"<rule><family>%s</family>" -"<table>%s</table><chain>%s</chain>" -"<handle>%llu</handle>" , -nft_family2str (r->family), r->table, r->chain, - (unsigned long long )r->handle); + ret =snprintf (buf, len,"<rule>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +if (r->flags & (1 <<NFT_RULE_ATTR_FAMILY )) { + ret =snprintf (buf+offset, len,"<family>%s</family>" , +nft_family2str (r->family)); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +if (r->flags & (1 <<NFT_RULE_ATTR_TABLE )) { + ret =snprintf (buf+offset, len,"<table>%s</table>" , + r->table); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +if (r->flags & (1 <<NFT_RULE_ATTR_CHAIN )) { + ret =snprintf (buf+offset, len,"<chain>%s</chain>" , + r->chain); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } +if (r->flags & (1 <<NFT_RULE_ATTR_HANDLE )) { + ret =snprintf (buf+offset, len,"<handle>%llu</handle>" , + (unsigned long long )r->handle); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } +if (r->compat.flags !=0 || r->compat.proto !=0 ) { ret =snprintf (buf+offset, len, "<compat_flags>%u</compat_flags>"
@@ -865,15 +904,42 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,return offset; } -static int nft_rule_snprintf_default (char *buf,size_t size,struct nft_rule *r, +static int nft_rule_snprintf_default (char *buf,size_t size,struct nft_rule *r,uint32_t type,uint32_t flags) {struct nft_rule_expr *expr;int ret, len = size, offset =0 , i; - ret =snprintf (buf, len,"%s %s %s %" PRIu64" %" PRIu64"\n" , -nft_family2str (r->family), r->table, r->chain, - r->handle, r->position); +if (r->flags & (1 <<NFT_RULE_ATTR_FAMILY )) { + ret =snprintf (buf+offset, len,"%s " , +nft_family2str (r->family)); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +if (r->flags & (1 <<NFT_RULE_ATTR_TABLE )) { + ret =snprintf (buf+offset, len,"%s " , + r->table); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +if (r->flags & (1 <<NFT_RULE_ATTR_CHAIN )) { + ret =snprintf (buf+offset, len,"%s " , + r->chain); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } +if (r->flags & (1 <<NFT_RULE_ATTR_TABLE )) { + ret =snprintf (buf+offset, len,"%llu " , + (unsigned long long )r->handle); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +if (r->flags & (1 <<NFT_RULE_ATTR_POSITION )) { + ret =snprintf (buf+offset, len,"%llu " , + (unsigned long long )r->position); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + + ret =snprintf (buf+offset, len,"\n" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);list_for_each_entry (expr, &r->expr_list, head) {
--
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
PATCH 2/2 src/rule: Changed parser support for having consistent with the new print support
From: Álvaro Neira Ayuso <[email protected]>
--- src/rule.c | 77 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 37 deletions(-)
src/rule.c +40 -37
@@ -540,28 +540,36 @@ int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree,if (root ==NULL )return -1 ; -if (nft_jansson_parse_family (root, &family, err) !=0 ) - goto err; +if (nft_jansson_node_exist (root,"family" )) { +if (nft_jansson_parse_family (root, &family, err) !=0 ) + goto err;nft_rule_attr_set_u32 (r,NFT_RULE_ATTR_FAMILY , family); + } - str =nft_jansson_parse_str (root,"table" , err); -if (str ==NULL ) - goto err; +if (nft_jansson_node_exist (root,"table" )) { + str =nft_jansson_parse_str (root,"table" , err); +if (str ==NULL ) + goto err; -nft_rule_attr_set_str (r,NFT_RULE_ATTR_TABLE , str); +nft_rule_attr_set_str (r,NFT_RULE_ATTR_TABLE , str); + } - str =nft_jansson_parse_str (root,"chain" , err); -if (str ==NULL ) - goto err; +if (nft_jansson_node_exist (root,"chain" )) { + str =nft_jansson_parse_str (root,"chain" , err); +if (str ==NULL ) + goto err; -nft_rule_attr_set_str (r,NFT_RULE_ATTR_CHAIN , str); +nft_rule_attr_set_str (r,NFT_RULE_ATTR_CHAIN , str); + } -if (nft_jansson_parse_val (root,"handle" ,NFT_TYPE_U64 , &uval64, - err) <0 ) - goto err; +if (nft_jansson_node_exist (root,"handle" )) { +if (nft_jansson_parse_val (root,"handle" ,NFT_TYPE_U64 , &uval64, + err) <0 ) + goto err; -nft_rule_attr_set_u64 (r,NFT_RULE_ATTR_HANDLE , uval64); +nft_rule_attr_set_u64 (r,NFT_RULE_ATTR_HANDLE , uval64); + }if (nft_jansson_node_exist (root,"compat_proto" ) ||nft_jansson_node_exist (root,"compat_flags" )) {
@@ -640,39 +648,34 @@ int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, family =nft_mxml_family_parse (tree,"family" ,MXML_DESCEND_FIRST ,NFT_XML_MAND , err); -if (family <0 ) -return -1 ; - - r->family = family; - r->flags |= (1 <<NFT_RULE_ATTR_FAMILY ); +if (family >=0 ) { + r->family = family; + r->flags |= (1 <<NFT_RULE_ATTR_FAMILY ); + } table =nft_mxml_str_parse (tree,"table" ,MXML_DESCEND_FIRST ,NFT_XML_MAND , err); -if (table ==NULL ) -return -1 ; - -if (r->table) -xfree (r->table); +if (table !=NULL ) { +if (r->table) +xfree (r->table); - r->table =strdup (table); - r->flags |= (1 <<NFT_RULE_ATTR_TABLE ); + r->table =strdup (table); + r->flags |= (1 <<NFT_RULE_ATTR_TABLE ); + } chain =nft_mxml_str_parse (tree,"chain" ,MXML_DESCEND_FIRST ,NFT_XML_MAND , err); -if (chain ==NULL ) -return -1 ; - -if (r->chain) -xfree (r->chain); +if (chain !=NULL ) { +if (r->chain) +xfree (r->chain); - r->chain =strdup (chain); - r->flags |= (1 <<NFT_RULE_ATTR_CHAIN ); + r->chain =strdup (chain); + r->flags |= (1 <<NFT_RULE_ATTR_CHAIN ); + }if (nft_mxml_num_parse (tree,"handle" ,MXML_DESCEND_FIRST ,BASE_DEC , - &r->handle,NFT_TYPE_U64 ,NFT_XML_MAND , err) !=0 ) -return -1 ; - - r->flags |= (1 <<NFT_RULE_ATTR_HANDLE ); + &r->handle,NFT_TYPE_U64 ,NFT_XML_MAND , err) >=0 ) + r->flags |= (1 <<NFT_RULE_ATTR_HANDLE ); if (nft_mxml_num_parse(tree, "compat_proto", MXML_DESCEND_FIRST, BASE_DEC, &r->compat.proto, NFT_TYPE_U32,
--
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
Re: [libnftnl PATCH 2/2] src/rule: Changed parser support for having consistent with the new print support
Hi Alvaro,
a few coments below about this patch.
Quoted 7 lines · Alvaro Neira Ayuso
From: Álvaro Neira Ayuso <[email protected]>
Signed-off-by Alvaro Neira Ayuso <[email protected]>--- src/rule.c | 77 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 37 deletions(-)
I would suggest to describe this parser change.
Quoted 7 lines
src/rule.c +0
-0@@ -540,28 +540,36 @@ int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree,if (root ==NULL )return -1 ;
src/rule.c int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree, · line 549
Quoted 10 lines
src/rule.c +4
-2-if (nft_jansson_parse_family (root, &family, err) !=0 ) - goto err; +if (nft_jansson_node_exist (root,"family" )) { +if (nft_jansson_parse_family (root, &family, err) !=0 ) + goto err;nft_rule_attr_set_u32 (r,NFT_RULE_ATTR_FAMILY , family); + }
Fix indentation. The nft_rule_attr_set_u32() is now inside the if statement.
src/rule.c int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree, · line 568
Quoted 6 lines
src/rule.c +3
-3-if (nft_jansson_parse_val (root,"handle" ,NFT_TYPE_U64 , &uval64, - err) <0 ) - goto err; +if (nft_jansson_node_exist (root,"handle" )) { +if (nft_jansson_parse_val (root,"handle" ,NFT_TYPE_U64 , &uval64, + err) <0 )
Mixed tab/spaces indentation before 'err) < 0)'
Quoted 4 lines
src/rule.c +0
-0@@ -640,39 +648,34 @@ int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, family =nft_mxml_family_parse (tree,"family" ,MXML_DESCEND_FIRST ,NFT_XML_MAND , err);
src/rule.c int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, · line 655
Quoted 10 lines
src/rule.c +4
-5-if (family <0 ) -return -1 ; - - r->family = family; - r->flags |= (1 <<NFT_RULE_ATTR_FAMILY ); +if (family >=0 ) { + r->family = family; + r->flags |= (1 <<NFT_RULE_ATTR_FAMILY ); + }
I would suggest to, while at it, switch to nft_rule_attr_set_xx() functions. IMHO, we will save some LOCs, among other benefits.
src/rule.c int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, · line 664
Quoted 5 lines
src/rule.c +3
-2- r->table =strdup (table); - r->flags |= (1 <<NFT_RULE_ATTR_TABLE ); + r->table =strdup (table); + r->flags |= (1 <<NFT_RULE_ATTR_TABLE ); + }
Just for completeness:
remember that for string attributes, the strdup() is done internally, inside nft_rule_attr_set_str().
src/rule.c int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, · line 677
Quoted 6 lines
src/rule.c +1
-4if (nft_mxml_num_parse (tree,"handle" ,MXML_DESCEND_FIRST ,BASE_DEC , - &r->handle,NFT_TYPE_U64 ,NFT_XML_MAND , err) !=0 ) -return -1 ; - - r->flags |= (1 <<NFT_RULE_ATTR_HANDLE ); + &r->handle,NFT_TYPE_U64 ,NFT_XML_MAND , err) >=0 )
The line above is 82 characters long.
regards!
Signature · 5 lines
Arturo Borrero González -- 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
Re: [libnftnl PATCH 2/2] src/rule: Changed parser support for having consistent with the new print support
Quoted 48 lines · Arturo Borrero Gonzalez
Hi Alvaro,
a few coments below about this patch.
Quoted 7 lines · Alvaro Neira Ayuso
From: Álvaro Neira Ayuso <[email protected]>
Signed-off-by Alvaro Neira Ayuso <[email protected]>--- src/rule.c | 77 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 37 deletions(-)I would suggest to describe this parser change.
Quoted 7 lines
src/rule.c +0
-0@@ -540,28 +540,36 @@ int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree,if (root ==NULL )return -1 ;src/rule.c int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree, · line 549
Quoted 10 lines
src/rule.c +4
-2-if (nft_jansson_parse_family (root, &family, err) !=0 ) - goto err; +if (nft_jansson_node_exist (root,"family" )) { +if (nft_jansson_parse_family (root, &family, err) !=0 ) + goto err;nft_rule_attr_set_u32 (r,NFT_RULE_ATTR_FAMILY , family); + }Fix indentation. The
nft_rule_attr_set_u32()is now inside the if statement.src/rule.c int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree, · line 568
Quoted 6 lines
src/rule.c +3
-3-if (nft_jansson_parse_val (root,"handle" ,NFT_TYPE_U64 , &uval64, - err) <0 ) - goto err; +if (nft_jansson_node_exist (root,"handle" )) { +if (nft_jansson_parse_val (root,"handle" ,NFT_TYPE_U64 , &uval64, + err) <0 )Mixed tab/spaces indentation before 'err) < 0)'
Quoted 2 lines
src/rule.c +0
-0@@ -640,39 +648,34 @@ int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r,
Quoted 15 lines
src/rule.c int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, · line 655
Quoted 12 lines
src/rule.c +4
-5family =nft_mxml_family_parse (tree,"family" ,MXML_DESCEND_FIRST ,NFT_XML_MAND , err); -if (family <0 ) -return -1 ; - - r->family = family; - r->flags |= (1 <<NFT_RULE_ATTR_FAMILY ); +if (family >=0 ) { + r->family = family; + r->flags |= (1 <<NFT_RULE_ATTR_FAMILY ); + }I would suggest to, while at it, switch to
nft_rule_attr_set_xx()functions. IMHO, we will save some LOCs, among other benefits.
Yes, i have put this like that for following the same format that you have had. The next time, i'm going to ask before :D. I'm going to change that.
Quoted 10 lines
src/rule.c int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, · line 664
Quoted 6 lines
src/rule.c +3
-2- r->table =strdup (table); - r->flags |= (1 <<NFT_RULE_ATTR_TABLE ); + r->table =strdup (table); + r->flags |= (1 <<NFT_RULE_ATTR_TABLE ); + }Just for completeness:
remember that for string attributes, thestrdup()is done internally, insidenft_rule_attr_set_str().
I know that ^^.
Quoted 9 lines
src/rule.c int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r, · line 677
Quoted 7 lines
src/rule.c +1
-4if (nft_mxml_num_parse (tree,"handle" ,MXML_DESCEND_FIRST ,BASE_DEC , - &r->handle,NFT_TYPE_U64 ,NFT_XML_MAND , err) !=0 ) -return -1 ; - - r->flags |= (1 <<NFT_RULE_ATTR_HANDLE ); + &r->handle,NFT_TYPE_U64 ,NFT_XML_MAND , err) >=0 )The line above is 82 characters long.
Thanks Arturo for helping me. I'm going to fix all the stuff.
Regards
Álvaro
--
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
Quoted 13 lines · Alvaro Neira Ayuso
From: Álvaro Neira Ayuso <[email protected]>
Before this patch, the program tried to print some attribute that maybe the user hasn't defined for printing. We can't assume that the user want to print some attribute that we have put mandatory in the rules. Example:
Before this patch, it's mandatory have a rule with family and this is the output:
{"rule":{"family":"ip","handle":4...
<rule><family>ip</family><handle>4</handle>...
Quoted 7 lines
Now, we can print rule without some attribute:
{"rule":{"handle":4...
<rule><handle>4</handle>...Signed-off-by Alvaro Neira Ayuso <[email protected]>---
Hi there!
These attributes are no longer mandatory? What is the idea behind this?
regards.
Signature · 5 lines
Arturo Borrero González -- 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 19 lines · Arturo Borrero Gonzalez
Quoted 18 lines · Alvaro Neira Ayuso
From: Álvaro Neira Ayuso <[email protected]>
Before this patch, the program tried to print some attribute that maybe the user hasn't defined for printing. We can't assume that the user want to print some attribute that we have put mandatory in the rules. Example:
Before this patch, it's mandatory have a rule with family and this is the output:
{"rule":{"family":"ip","handle":4...
<rule><family>ip</family><handle>4</handle>...Now, we can print rule without some attribute:
{"rule":{"handle":4...
<rule><handle>4</handle>...
Quoted 6 lines
Quoted 2 lines
Signed-off-by Alvaro Neira Ayuso <[email protected]>---
Hi there!
These attributes are no longer mandatory? What is the idea behind this?
I think we already discussed this time ago.
I'd like that the parsers don't enforce the occurrence of any attribute, we should just let the kernel bail out if the configuration that the user provides doesn't make sense.
This provides us more flexibility in case that we change any aspect from the kernel side.
--
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
Hi Alvaro,
I found a small issue in your patch, see below.
Except for this, the patch looks good to me.
Quoted 26 lines · Alvaro Neira Ayuso
src/rule.c +13
-4@@ -865,15 +904,42 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,return offset; } -static int nft_rule_snprintf_default (char *buf,size_t size,struct nft_rule *r, +static int nft_rule_snprintf_default (char *buf,size_t size,struct nft_rule *r,uint32_t type,uint32_t flags) {struct nft_rule_expr *expr;int ret, len = size, offset =0 , i; - ret =snprintf (buf, len,"%s %s %s %" PRIu64" %" PRIu64"\n" , -nft_family2str (r->family), r->table, r->chain, - r->handle, r->position); +if (r->flags & (1 <<NFT_RULE_ATTR_FAMILY )) { + ret =snprintf (buf+offset, len,"%s " , +nft_family2str (r->family)); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +if (r->flags & (1 <<NFT_RULE_ATTR_TABLE )) { + ret =snprintf (buf+offset, len,"%s " , + r->table); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } +
src/rule.c static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r, · line 934
Quoted 10 lines
src/rule.c +10
-0+if (r->flags & (1 <<NFT_RULE_ATTR_CHAIN )) { + ret =snprintf (buf+offset, len,"%s " , + r->chain); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } +if (r->flags & (1 <<NFT_RULE_ATTR_TABLE )) { + ret =snprintf (buf+offset, len,"%llu " , + (unsigned long long )r->handle); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + }
Here you check the table attr but print handle.
Regards.
Signature · 5 lines
Arturo Borrero González -- 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