Basic support for printing nft_data_reg in XML format.
PATCH 1/1 Basic support for printing nft_data_reg in XML format.
nft_data_reg now is printed in XML according to what it contains.
--- src/expr/bitwise.c | 34 ++++++++---------- src/expr/cmp.c | 23 ++++++------ src/expr/data_reg.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/expr/data_reg.h | 3 ++ src/expr/immediate.c | 83 +++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 201 insertions(+), 36 deletions(-)
src/expr/bitwise.c +15 -19
@@ -199,7 +199,7 @@ static int nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, struct nft_expr_bitwise *bitwise) { -int len = size, offset =0 , ret, i; +int len = size, offset =0 , ret; ret = snprintf(buf, len, "\t\t<sreg>%u</sreg> " "<dreg>%u</dreg> ",
@@ -209,19 +209,16 @@ nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, ret =snprintf (buf+offset, len,"<mask>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<bitwise->mask.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , - bitwise->mask.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &bitwise->mask, +NFT_RULE_O_XML ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); ret =snprintf (buf+offset, len,"</mask> <xor>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<bitwise->xor.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , bitwise->xor.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &bitwise->xor, +NFT_RULE_O_XML ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); ret =snprintf (buf+offset, len,"</xor> " );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
@@ -233,7 +230,7 @@ static int nft_rule_expr_bitwise_snprintf_default(char *buf, size_t size, struct nft_expr_bitwise *bitwise) { -int len = size, offset =0 , ret, i; +int len = size, offset =0 , ret; ret =snprintf (buf, len,"sreg=%u dreg=%u " , bitwise->sreg, bitwise->dreg);
@@ -242,18 +239,17 @@ nft_rule_expr_bitwise_snprintf_default(char *buf, size_t size, ret =snprintf (buf+offset, len," mask=" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<bitwise->mask.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , bitwise->mask.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &bitwise->mask, +NFT_RULE_O_DEFAULT ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); ret =snprintf (buf+offset, len," xor=" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<bitwise->xor.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , bitwise->xor.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + + ret =nft_data_reg_snprintf (buf+offset, len, &bitwise->xor, +NFT_RULE_O_DEFAULT ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; }
src/expr/cmp.c +11 -12
@@ -169,18 +169,17 @@ static char *expr_cmp_str[] = {static int nft_rule_expr_cmp_snprintf_xml (char *buf,size_t size,struct nft_expr_cmp *cmp) { -int len = size, offset =0 , ret, i; +int len = size, offset =0 , ret; - ret =snprintf (buf, len,"\t\t<sreg>%u</sreg> <op>%s</op> <data>" , + ret =snprintf (buf, len,"\t\t<sreg>%u</sreg> <op>%s</op> <cmpdata>" , cmp->sreg, expr_cmp_str[cmp->op]);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<cmp->data.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , cmp->data.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &cmp->data, +NFT_RULE_O_XML ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =snprintf (buf+offset, len,"</data> " ); + ret =snprintf (buf+offset, len,"</cmpdata> " );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset;
@@ -190,16 +189,16 @@ static int nft_rule_expr_cmp_snprintf_default(char *buf, size_t size, struct nft_expr_cmp *cmp) { -int len = size, offset =0 , ret, i; +int len = size, offset =0 , ret; ret =snprintf (buf, len,"sreg=%u op=%s data=" , cmp->sreg, expr_cmp_str[cmp->op]);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<cmp->data.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , cmp->data.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &cmp->data, +NFT_RULE_O_DEFAULT ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +return offset; }
src/expr/data_reg.c +94 -0
104 lines not on this page · raw message
src/expr/data_reg.h +3 -0
@@ -18,6 +18,9 @@ union nft_data_reg { }; }; +int nft_data_reg_snprintf (char *buf,size_t size,union nft_data_reg *reg, +uint32_t output_format,uint32_t flags,int reg_type); +int nft_data_reg_xml_parse (union nft_data_reg *reg,char *xml);int nft_parse_data (union nft_data_reg *data,struct nlattr *attr,int *type);#endif
src/expr/immediate.c +78 -5
96 lines not on this page · raw message
Pablo Neira Ayuso
maintainerHi Arturo,
Looks almost good, some comments below.
Quoted 34 lines · Arturo Borrero
nft_data_regnow is printed in XML according to what it contains.--- src/expr/bitwise.c | 34 ++++++++---------- src/expr/cmp.c | 23 ++++++------ src/expr/data_reg.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/expr/data_reg.h | 3 ++ src/expr/immediate.c | 83 +++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 201 insertions(+), 36 deletions(-)src/expr/bitwise.c +4
-6@@ -199,7 +199,7 @@ static int nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, struct nft_expr_bitwise *bitwise) { -int len = size, offset =0 , ret, i; +int len = size, offset =0 , ret; ret = snprintf(buf, len, "\t\t<sreg>%u</sreg> " "<dreg>%u</dreg> ",@@ -209,19 +209,16 @@ nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, ret =snprintf (buf+offset, len,"<mask>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<bitwise->mask.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , - bitwise->mask.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &bitwise->mask, +NFT_RULE_O_XML ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
src/expr/bitwise.c nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, · line 220
Quoted 10 lines
src/expr/bitwise.c +2
-4ret =snprintf (buf+offset, len,"</mask> <xor>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<bitwise->xor.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , bitwise->xor.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &bitwise->xor, +NFT_RULE_O_XML ,0 ,DATA_VALUE );
Cosmetic change, this is prefered:
ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->xor,
NFT_RULE_O_XML, 0, DATA_VALUE);
^Note the second line is aligned with the parenthesis.
Quoted 100 lines
src/expr/bitwise.c +9
-9+SNPRINTF_BUFFER_SIZE (ret, size, len, offset); ret =snprintf (buf+offset, len,"</xor> " );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);@@ -233,7 +230,7 @@ static int nft_rule_expr_bitwise_snprintf_default(char *buf, size_t size, struct nft_expr_bitwise *bitwise) { -int len = size, offset =0 , ret, i; +int len = size, offset =0 , ret; ret =snprintf (buf, len,"sreg=%u dreg=%u " , bitwise->sreg, bitwise->dreg);@@ -242,18 +239,17 @@ nft_rule_expr_bitwise_snprintf_default(char *buf, size_t size, ret =snprintf (buf+offset, len," mask=" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<bitwise->mask.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , bitwise->mask.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &bitwise->mask, +NFT_RULE_O_DEFAULT ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); ret =snprintf (buf+offset, len," xor=" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<bitwise->xor.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , bitwise->xor.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + + ret =nft_data_reg_snprintf (buf+offset, len, &bitwise->xor, +NFT_RULE_O_DEFAULT ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset; }src/expr/cmp.c +11
-12@@ -169,18 +169,17 @@ static char *expr_cmp_str[] = {static int nft_rule_expr_cmp_snprintf_xml (char *buf,size_t size,struct nft_expr_cmp *cmp) { -int len = size, offset =0 , ret, i; +int len = size, offset =0 , ret; - ret =snprintf (buf, len,"\t\t<sreg>%u</sreg> <op>%s</op> <data>" , + ret =snprintf (buf, len,"\t\t<sreg>%u</sreg> <op>%s</op> <cmpdata>" , cmp->sreg, expr_cmp_str[cmp->op]);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<cmp->data.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , cmp->data.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &cmp->data, +NFT_RULE_O_XML ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =snprintf (buf+offset, len,"</data> " ); + ret =snprintf (buf+offset, len,"</cmpdata> " );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset;@@ -190,16 +189,16 @@ static int nft_rule_expr_cmp_snprintf_default(char *buf, size_t size, struct nft_expr_cmp *cmp) { -int len = size, offset =0 , ret, i; +int len = size, offset =0 , ret; ret =snprintf (buf, len,"sreg=%u op=%s data=" , cmp->sreg, expr_cmp_str[cmp->op]);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -for (i=0 ; i<cmp->data.len/sizeof (uint32_t ); i++) { - ret =snprintf (buf+offset, len,"%.8x " , cmp->data.val[i]); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } + ret =nft_data_reg_snprintf (buf+offset, len, &cmp->data, +NFT_RULE_O_DEFAULT ,0 ,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +return offset; }src/expr/data_reg.c +1
-0@@ -18,10 +18,104 @@#include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> #include <libnftables/expr.h> +#include <libnftables/rule.h> #include "expr_ops.h"
src/expr/data_reg.c line 32
Quoted 10 lines
src/expr/data_reg.c +7
-0#include "data_reg.h" #include "internal.h" +static +int nft_data_reg_value_snprintf_xml (char *buf,size_t size, +union nft_data_reg *reg,uint32_t flags) +{ +int len = size, offset =0 , ret, i, j; +uint8_t *tmp; +int data_len=reg->len/sizeof (uint32_t );
Another minor nitpick, for consistency:
data_len = reg...
^ ^
Quoted 153 lines
src/expr/data_reg.c +86
-0+ + ret =snprintf (buf, len,"<data_reg type=\"value\" >" ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + + ret =snprintf (buf+offset, len,"<len>%d</len>" , data_len); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + +for (i=0 ; i<data_len; i++) { + ret =snprintf (buf+offset, len,"<data%d>0x" , i); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + + tmp = (uint8_t *)®->val[i]; + +for (j=0 ; j<sizeof (int ); j++) { + ret =snprintf (buf+offset, len,"%.02x" , tmp[j]); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + + ret =snprintf (buf+offset, len,"</data%d>" , i); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + + ret =snprintf (buf+offset, len,"</data_reg>" ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + +return offset; +} + +static int nft_data_reg_value_snprintf_default (char *buf,size_t size, +union nft_data_reg *reg,uint32_t flags) +{ +int len = size, offset =0 , ret, i; + +for (i=0 ; i<reg->len/sizeof (uint32_t ); i++) { + ret =snprintf (buf+offset, len,"0x%.8x " , reg->val[i]); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +return offset; +} + +int nft_data_reg_snprintf (char *buf,size_t size,union nft_data_reg *reg, +uint32_t output_format,uint32_t flags,int reg_type) +{ +switch (reg_type) { +case DATA_VALUE : +switch (output_format) { +case NFT_RULE_O_XML : +return nft_data_reg_value_snprintf_xml (buf, size, + reg, flags); +case NFT_RULE_O_DEFAULT : +return nft_data_reg_value_snprintf_default (buf, size, + reg, flags); +default : +break ; + } +case DATA_VERDICT : +switch (output_format) { +case NFT_RULE_O_XML : +return snprintf (buf, size, +"<data_reg type=\"verdict\" >" +"<verdict>%d</verdict>" +"</data_reg>" , reg->verdict); +case NFT_RULE_O_DEFAULT : +return snprintf (buf, size,"verdict=%d" , reg->verdict); +default : +break ; + } +case DATA_CHAIN : +switch (output_format) { +case NFT_RULE_O_XML : +return snprintf (buf, size, +"<data_reg type=\"chain\" >" +"<chain>%s</chain>" +"</data_reg>" , reg->chain); +case NFT_RULE_O_DEFAULT : +return snprintf (buf, size,"chain=%s" , reg->chain); +default : +break ; + } +default : +break ; + } +return -1 ; +} +static int nft_data_parse_cb (const struct nlattr *attr,void *data) {const struct nlattr **tb = data;src/expr/data_reg.h +3
-0@@ -18,6 +18,9 @@ union nft_data_reg { }; }; +int nft_data_reg_snprintf (char *buf,size_t size,union nft_data_reg *reg, +uint32_t output_format,uint32_t flags,int reg_type); +int nft_data_reg_xml_parse (union nft_data_reg *reg,char *xml);int nft_parse_data (union nft_data_reg *data,struct nlattr *attr,int *type);#endif src/expr/immediate.c +42
-0@@ -196,6 +196,82 @@ nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr) }static int +nft_rule_expr_immediate_snprintf_xml (char *buf,size_t len, +struct nft_expr_immediate *imm,uint32_t flags) +{ +int size = len, offset =0 , ret; +size_t *voidpointer=NULL ; + + ret =snprintf (buf, len,"\t\t<dreg>%u</dreg>" +"\n\t\t<immediatedata>" , imm->dreg); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + +/* If nft_rule_expr_immediate_get return != NULL then +* the attribute is set and we need to print it out */ + +if (nft_rule_expr_immediate_get ((struct nft_rule_expr *)imm, +NFT_EXPR_IMM_DATA , voidpointer) !=NULL ) { + ret =nft_data_reg_snprintf (buf+offset, len, &imm->data, +NFT_RULE_O_XML , flags,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + + }else if (nft_rule_expr_immediate_get ((struct nft_rule_expr *)imm, +NFT_EXPR_IMM_VERDICT , voidpointer) !=NULL ) { + ret =nft_data_reg_snprintf (buf+offset, len, &imm->data, +NFT_RULE_O_XML , flags,DATA_VERDICT ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + + }else if (nft_rule_expr_immediate_get ((struct nft_rule_expr *)imm, +NFT_EXPR_IMM_CHAIN , voidpointer) !=NULL ) { + ret =nft_data_reg_snprintf (buf+offset, len, &imm->data, +NFT_RULE_O_XML , flags,DATA_CHAIN ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + } + +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + + ret =snprintf (buf+offset, len,"</immediatedata>" ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + +return offset; +} + +static int +nft_rule_expr_immediate_snprintf_default(char *buf, size_t len,
src/expr/immediate.c nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr) · line 250
Quoted 10 lines
src/expr/immediate.c +10
-0+ struct nft_expr_immediate *imm, uint32_t flags) +{ + int size = len, offset = 0, ret; +size_t *voidpointer=NULL ; + + ret =snprintf (buf, len,"dreg=%u" , imm->dreg); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + +/* If nft_rule_expr_immediate_get return != NULL then +* the attribute is set and we need to print it out */
Comments in the Linux kernel, and by extension netfilter codebase, should be like:
/* If nft_rule_expr_immediate_get return != NULL then
* the attribute is set and we need to print it out. */
src/expr/immediate.c nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr) · line 213
Quoted 3 lines
src/expr/immediate.c +3
-0+ +if (nft_rule_expr_immediate_get ((struct nft_rule_expr *)imm, +NFT_EXPR_IMM_DATA , voidpointer) !=NULL ) {
The get/set interface is for third party applications, it's an extensibility trick that allows us to add new attributes without breaking backward compatibility.
Quoted 1 line
From the library itself, you can use
imm->data.valdirectly. You will
have to check if the attribute is set, ie.
if (e->flags & (1 << NFT_EXPR_IMM_DATA))
...
src/expr/immediate.c nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr) · line 259
Quoted 6 lines
src/expr/immediate.c +6
-0+ ret =nft_data_reg_snprintf (buf+offset, len, &imm->data, +NFT_RULE_O_DEFAULT , flags,DATA_VALUE ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + + }else if (nft_rule_expr_immediate_get ((struct nft_rule_expr *)imm, +NFT_EXPR_IMM_VERDICT , voidpointer) !=NULL ) {
Same thing here, but imm->data.verdict in this case.
src/expr/immediate.c nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr) · line 265
Quoted 6 lines
src/expr/immediate.c +6
-0+ ret =nft_data_reg_snprintf (buf+offset, len, &imm->data, +NFT_RULE_O_DEFAULT , flags,DATA_VERDICT ); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + + }else if (nft_rule_expr_immediate_get ((struct nft_rule_expr *)imm, +NFT_EXPR_IMM_CHAIN , voidpointer) !=NULL ) {
And imm->data.chain in this case.
Please, revamp and submit a v2. We're almost at it.
Thanks.