XML works
cover XML works
The following series implements:
* small XML format fixes in printing.
* a workaround for target/match binary data.
* delete all \n and \t in XML printing.
* print expr flags in XML (the <expr_flags> node)
* [RFC] XML-to-object parsing.
Note that for XML parsing i've used libmxml (http://minixml.org/)
Also, please consider the XML parsing code a RFC.
---
Arturo Borrero (5):
src: rule: small fix XML output
src: expr: XML printing for binary data in targer and match
src: xml printing: delete text format
src: expr: print flags in XML
src: support for XML parsing
Make_global.am | 2 configure.ac | 1 include/libnftables/chain.h | 1 include/libnftables/rule.h | 1 include/libnftables/table.h | 1 src/chain.c | 206 ++++++++++++++++++++++++++++++++++-- src/expr/bitwise.c | 151 ++++++++++++++++++++++++-- src/expr/cmp.c | 139 +++++++++++++++++++++++- src/expr/counter.c | 87 +++++++++++++++ src/expr/data_reg.c | 249 +++++++++++++++++++++++++++++++++++++++++++ src/expr/immediate.c | 118 ++++++++++++++++++++ src/expr/lookup.c | 107 +++++++++++++++++- src/expr/match.c | 146 ++++++++++++++++++++++++- src/expr/meta.c | 84 ++++++++++++++- src/expr/nat.c | 159 +++++++++++++++++++++++++++ src/expr/payload.c | 118 ++++++++++++++++++++ src/expr/target.c | 148 +++++++++++++++++++++++++- src/expr_ops.h | 1 src/libnftables.map | 3 + src/rule.c | 189 ++++++++++++++++++++++++++++++++- src/table.c | 102 ++++++++++++++++-- 21 files changed, 1937 insertions(+), 76 deletions(-)
Signature · 1 line
Signature
PATCH 1/5 src: rule: small fix XML output
This patch aplies two fixes:
* snprintf XML output offset for rule.
* add XML <flags> node, missing in previous patches.
The <flags> node will be used for parsing a rule in XML.
--- src/rule.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
src/rule.c +3 -2
@@ -451,9 +451,10 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); ret =snprintf (buf+offset, len,"<rule_flags>%u</rule_flags>" +"<flags>%u</flags>" "<compat_flags>%u</compat_flags>" "<compat_proto>%u</compat_proto>" , - r->rule_flags, + r->rule_flags, r->flags, r->compat.flags, r->compat.proto);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
@@ -469,7 +470,7 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); } - ret =snprintf (buf+offset-1 , len,"\n</rule>\n " ); + ret =snprintf (buf+offset, len,"\n</rule>\n " );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return ret;
--
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
maintainerRe: [libnftables PATCH 1/5] src: rule: small fix XML output
Hi Arturo,
Quoted 16 lines · Arturo Borrero
This patch aplies two fixes:
* snprintf XML output offset for rule.
* add XML <flags> node, missing in previous patches.The <flags> node will be used for parsing a rule in XML.
Signed-off-by Arturo Borrero González <[email protected]>--- src/rule.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)src/rule.c +0
-0
src/rule.c static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r, · line 457
Quoted 8 lines
src/rule.c +2
-1@@ -451,9 +451,10 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); ret = snprintf(buf+offset, len, "<rule_flags>%u</rule_flags>" + "<flags>%u</flags>" "<compat_flags>%u</compat_flags>" "<compat_proto>%u</compat_proto>", - r->rule_flags, + r->rule_flags, r->flags,
You should not rely on the r->flags in the XML parser. Same thing for table, chain and expressions. Those flags are internal to the library object representation and I would prefer if they still remain like that.
I have applied this chunk below as bugfix.
src/rule.c static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r, · line 476
Quoted 12 lines
src/rule.c +1
-1r->compat.flags, r->compat.proto);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);@@ -469,7 +470,7 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); } - ret =snprintf (buf+offset-1 , len,"\n</rule>\n " ); + ret =snprintf (buf+offset, len,"\n</rule>\n " );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return ret;
--
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/5 src: expr: XML printing for binary data in targer and match
In reply to Arturo BorreroThis is a try for expr/match and expr/target to be more XML friendly.
--- src/expr/match.c | 6 +++--- src/expr/target.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
src/expr/match.c +3 -3
@@ -193,12 +193,12 @@ int nft_rule_expr_match_snprintf_xml(char *buf, size_t len,int offset =0 ;uint8_t *data = (uint8_t *)mt->data; - ret =snprintf (buf, len,"\t\t<name>%s</name> <rev>%u</rev> <info>0x" , - mt->name, mt->rev); + ret =snprintf (buf, len,"\t\t<name>%s</name> <rev>%u</rev> <info><len>%u</len>" , + mt->name, mt->rev, mt->data_len);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);for (i=0 ; i < mt->data_len; i++) { - ret =snprintf (buf+offset, len,"%x" , data[i] &0xff ); + ret =snprintf (buf+offset, len,"<data%d>0x%.2x</data%d>" ,i, data[i] &0xff , i);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); }
src/expr/target.c +3 -3
@@ -193,12 +193,12 @@ int nft_rule_exp_target_snprintf_xml(char *buf, size_t len,int offset =0 ;uint8_t *data = (uint8_t *)tg->data; - ret =snprintf (buf, len,"\t\t<name>%s</name> <rev>%u</rev> <info>0x" , - tg->name, tg->rev); + ret =snprintf (buf, len,"\t\t<name>%s</name> <rev>%u</rev> <info><len>%u</len>" , + tg->name, tg->rev, tg->data_len);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);for (i=0 ; i < tg->data_len; i++) { - ret =snprintf (buf+offset, len,"%x" , data[i] &0xff ); + ret =snprintf (buf+offset, len,"<data%d>0x%.2x</data%d>" ,i, data[i] &0xff , i);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); }
--
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 3/5 src: xml printing: delete text format
In reply to Arturo BorreroDelete all \n and \t from XML output.
--- src/chain.c | 24 ++++++++++++------------ src/expr/bitwise.c | 8 ++++---- src/expr/cmp.c | 4 ++-- src/expr/counter.c | 2 +- src/expr/immediate.c | 4 ++-- src/expr/lookup.c | 2 +- src/expr/match.c | 2 +- src/expr/meta.c | 4 ++-- src/expr/nat.c | 8 ++++---- src/expr/payload.c | 4 ++-- src/expr/target.c | 2 +- src/rule.c | 8 ++++---- src/table.c | 14 +++++++------- 13 files changed, 43 insertions(+), 43 deletions(-)
src/chain.c +12 -12
@@ -450,18 +450,18 @@ static int nft_chain_snprintf_xml(char *buf, size_t size, struct nft_chain *c) {return snprintf (buf, size,"<chain name=\"%s\" handle=\"%lu\"" -" bytes=\"%lu\" packets=\"%lu\" >\n" -"\t<properties>\n" -"\t\t<flags>%d</flags>\n" -"\t\t<type>%s</type>\n" -"\t\t<table>%s</table>\n" -"\t\t<prio>%d</prio>\n" -"\t\t<use>%d</use>\n" -"\t\t<hooknum>%d</hooknum>\n" -"\t\t<policy>%d</policy>\n" -"\t\t<family>%d</family>\n" -"\t</properties>\n" -"</chain>\n" , +" bytes=\"%lu\" packets=\"%lu\" >" +"<properties>" +"<flags>%d</flags>" +"<type>%s</type>" +"<table>%s</table>" +"<prio>%d</prio>" +"<use>%d</use>" +"<hooknum>%d</hooknum>" +"<policy>%d</policy>" +"<family>%d</family>" +"</properties>" +"</chain>" , c->name, c->handle, c->bytes, c->packets, c->flags, c->type, c->table, c->prio, c->use, c->hooknum, c->policy, c->family);
src/expr/bitwise.c +4 -4
@@ -201,8 +201,8 @@ nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, {int len = size, offset =0 , ret; - ret =snprintf (buf, len,"\t\t<sreg>%u</sreg> " -"<dreg>%u</dreg> " , + ret =snprintf (buf, len,"<sreg>%u</sreg>" +"<dreg>%u</dreg>" , bitwise->sreg, bitwise->dreg);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
@@ -213,14 +213,14 @@ nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, NFT_RULE_O_XML, 0, DATA_VALUE);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =snprintf (buf+offset, len,"</mask> <xor>" ); + ret =snprintf (buf+offset, len,"</mask><xor>" );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> " ); + ret =snprintf (buf+offset, len,"</xor>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset;
src/expr/cmp.c +2 -2
@@ -171,7 +171,7 @@ nft_rule_expr_cmp_snprintf_xml(char *buf, size_t size, struct nft_expr_cmp *cmp) {int len = size, offset =0 , ret; - ret =snprintf (buf, len,"\t\t<sreg>%u</sreg> <op>%s</op> <cmpdata>" , + ret =snprintf (buf, len,"<sreg>%u</sreg><op>%s</op><cmpdata>" , cmp->sreg, expr_cmp_str[cmp->op]);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
@@ -179,7 +179,7 @@ nft_rule_expr_cmp_snprintf_xml(char *buf, size_t size, struct nft_expr_cmp *cmp) NFT_RULE_O_XML, 0, DATA_VALUE);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =snprintf (buf+offset, len,"</cmpdata> " ); + ret =snprintf (buf+offset, len,"</cmpdata>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset;
src/expr/counter.c +1 -1
@@ -133,7 +133,7 @@ nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type,switch (type) {case NFT_RULE_O_XML : -return snprintf (buf, len,"\t\t<pkts>%lu</pkts> <bytes>%lu</bytes> " , +return snprintf (buf, len,"<pkts>%lu</pkts><bytes>%lu</bytes>" , ctr->pkts, ctr->bytes);case NFT_RULE_O_DEFAULT : return snprintf(buf, len, "pkts=%lu bytes=%lu ",
src/expr/immediate.c +2 -2
@@ -202,8 +202,8 @@ nft_rule_expr_immediate_snprintf_xml(char *buf, size_t len,int size = len, offset =0 , ret;struct nft_expr_immediate *imm = (struct nft_expr_immediate *)e->data; - ret =snprintf (buf, len,"\t\t<dreg>%u</dreg>" -"\n\t\t<immediatedata>" , imm->dreg); + ret =snprintf (buf, len,"<dreg>%u</dreg>" +"<immediatedata>" , imm->dreg);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
src/expr/lookup.c +1 -1
@@ -156,7 +156,7 @@ nft_rule_expr_lookup_snprintf_xml(char *buf, size_t size, {int len = size, offset =0 , ret; - ret =snprintf (buf, len,"<set>%s</set><sreg>%u</sreg><dreg>%u</dreg>\n" , + ret =snprintf (buf, len,"<set>%s</set><sreg>%u</sreg><dreg>%u</dreg>" , l->set_name, l->sreg, l->dreg);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
src/expr/match.c +1 -1
@@ -193,7 +193,7 @@ int nft_rule_expr_match_snprintf_xml(char *buf, size_t len,int offset =0 ;uint8_t *data = (uint8_t *)mt->data; - ret =snprintf (buf, len,"\t\t<name>%s</name> <rev>%u</rev> <info><len>%u</len>" , + ret =snprintf (buf, len,"<name>%s</name><rev>%u</rev><info><len>%u</len>" , mt->name, mt->rev, mt->data_len);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
src/expr/meta.c +2 -2
@@ -133,8 +133,8 @@ nft_rule_expr_meta_snprintf(char *buf, size_t len, uint32_t type,switch (type) {case NFT_RULE_O_XML : -return snprintf (buf, len,"\t\t<dreg>%u</dreg>" -" <key>%u</key> " , +return snprintf (buf, len,"<dreg>%u</dreg>" +"<key>%u</key>" , meta->dreg, meta->key);case NFT_RULE_O_DEFAULT : return snprintf(buf, len, "dreg=%u key=%u ",
src/expr/nat.c +4 -4
@@ -211,17 +211,17 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size,switch (nat->type) {case NFT_NAT_SNAT : ret =snprintf (buf, len, -"\t\t<type>NFT_NAT_SNAT</type> " ); +"<type>NFT_NAT_SNAT</type>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);break ;case NFT_NAT_DNAT : ret =snprintf (buf, len, -"\t\t<type>NFT_NAT_DNAT</type> " ); +"<type>NFT_NAT_DNAT</type>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);break ; } - ret =snprintf (buf, len,"<family>%s</family> " , + ret =snprintf (buf, len,"<family>%s</family>" , nat->family ==AF_INET ?"AF_INET" :"AF_INET6" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
@@ -234,7 +234,7 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size,if (e->flags & (1 <<NFT_EXPR_NAT_REG_PROTO_MIN )) { ret =snprintf (buf, len,"<sreg_proto_min>%u</sreg_proto_min>" -" <sreg_proto_max>%u</sreg_proto_max> " , +"<sreg_proto_max>%u</sreg_proto_max>" , nat->sreg_proto_min, nat->sreg_proto_max);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); }
src/expr/payload.c +2 -2
@@ -172,8 +172,8 @@ nft_rule_expr_payload_snprintf(char *buf, size_t len, uint32_t type,switch (type) {case NFT_RULE_O_XML : -return snprintf (buf, len,"\t\t<dreg>%u</dreg>" -"<base>%u</base> <offset>%u</offset>" +return snprintf (buf, len,"<dreg>%u</dreg>" +"<base>%u</base><offset>%u</offset>" "<len>%u</len>" , payload->dreg, payload->base, payload->offset, payload->len);
src/expr/target.c +1 -1
@@ -193,7 +193,7 @@ int nft_rule_exp_target_snprintf_xml(char *buf, size_t len,int offset =0 ;uint8_t *data = (uint8_t *)tg->data; - ret =snprintf (buf, len,"\t\t<name>%s</name> <rev>%u</rev> <info><len>%u</len>" , + ret =snprintf (buf, len,"<name>%s</name><rev>%u</rev><info><len>%u</len>" , tg->name, tg->rev, tg->data_len);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
src/rule.c +4 -4
@@ -445,7 +445,7 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r, ret =snprintf (buf, size,"<rule family=\"%u\" table=\"%s\" " -"chain=\"%s\" handle=\"%llu\">\n " , +"chain=\"%s\" handle=\"%llu\">" , r->family, r->table, r->chain, (unsigned long long )r->handle);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
@@ -460,17 +460,17 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,list_for_each_entry (expr, &r->expr_list, head) { ret =snprintf (buf+offset, len, -"\n\t<expr type=\"%s\">\n" , expr->ops->name); +"<expr type=\"%s\">" , expr->ops->name);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); ret = expr->ops->snprintf (buf+offset, len, type, flags, expr);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - ret =snprintf (buf+offset, len,"\n\t</expr>" ); + ret =snprintf (buf+offset, len,"</expr>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); } - ret =snprintf (buf+offset, len,"\n</rule>\n " ); + ret =snprintf (buf+offset, len,"</rule>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return ret;
src/table.c +7 -7
@@ -185,13 +185,13 @@ EXPORT_SYMBOL(nft_table_nlmsg_parse);static int nft_table_snprintf_xml (char *buf,size_t size,struct nft_table *t) {return snprintf (buf, size, -"<table name=\"%s\" >\n" -"\t<properties>\n" -"\t\t<family>%u</family>\n" -"\t\t<flags>%d</flags>\n" -"\t\t<table_flags>%d</table_flags>\n" -"\t</properties>\n" -"</table>\n" , +"<table name=\"%s\" >" +"<properties>" +"<family>%u</family>" +"<flags>%d</flags>" +"<table_flags>%d</table_flags>" +"</properties>" +"</table>" , t->name, t->family, t->flags, t->table_flags); }
Pablo Neira Ayuso
maintainerRe: [libnftables PATCH 3/5] src: xml printing: delete text format
Quoted 1 line · Arturo Borrero
Delete all \n and \t from XML output.
I have also applied this cleanup. Thanks.
PATCH 4/5 src: expr: print flags in XML
In reply to Arturo BorreroThis patch adds the <expr_flags> XML node to expressions printing.
Using this new node, a exact copy of the expr is exported, so is possible to know what attributes were originally set in the expr.
--- src/expr/bitwise.c | 17 ++++++++++------- src/expr/cmp.c | 15 ++++++++++----- src/expr/counter.c | 6 ++++-- src/expr/immediate.c | 4 ++++ src/expr/lookup.c | 17 +++++++++-------- src/expr/match.c | 8 ++++++-- src/expr/meta.c | 5 +++-- src/expr/nat.c | 4 ++++ src/expr/payload.c | 5 +++-- src/expr/target.c | 9 +++++++-- 10 files changed, 60 insertions(+), 30 deletions(-)
src/expr/bitwise.c +10 -7
@@ -197,8 +197,9 @@ nft_rule_expr_bitwise_parse(struct nft_rule_expr *e, struct nlattr *attr)static int nft_rule_expr_bitwise_snprintf_xml (char *buf,size_t size, -struct nft_expr_bitwise *bitwise) +struct nft_rule_expr *e) { +struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;int len = size, offset =0 , ret; ret = snprintf(buf, len, "<sreg>%u</sreg>"
@@ -223,13 +224,18 @@ nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, ret =snprintf (buf+offset, len,"</xor>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + ret =snprintf (buf+offset, len,"<expr_flags>%u</expr_flags>" , + e->flags); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +return offset; }static int nft_rule_expr_bitwise_snprintf_default (char *buf,size_t size, -struct nft_expr_bitwise *bitwise) +struct nft_rule_expr *e) { +struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;int len = size, offset =0 , ret; ret = snprintf(buf, len, "sreg=%u dreg=%u ",
@@ -257,14 +263,11 @@ static int nft_rule_expr_bitwise_snprintf(char *buf, size_t size, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { -struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data; -switch (type) {case NFT_RULE_O_XML : -return nft_rule_expr_bitwise_snprintf_xml (buf, size, bitwise); +return nft_rule_expr_bitwise_snprintf_xml (buf, size, e);case NFT_RULE_O_DEFAULT : -return nft_rule_expr_bitwise_snprintf_default (buf, size, - bitwise); +return nft_rule_expr_bitwise_snprintf_default (buf, size, e);default :break ; }
src/expr/cmp.c +10 -5
@@ -167,8 +167,9 @@ static char *expr_cmp_str[] = { };static int -nft_rule_expr_cmp_snprintf_xml (char *buf,size_t size,struct nft_expr_cmp *cmp) +nft_rule_expr_cmp_snprintf_xml (char *buf,size_t size,struct nft_rule_expr *e) { +struct nft_expr_cmp *cmp = (struct nft_expr_cmp *)e->data;int len = size, offset =0 , ret; ret = snprintf(buf, len, "<sreg>%u</sreg><op>%s</op><cmpdata>",
@@ -182,13 +183,18 @@ nft_rule_expr_cmp_snprintf_xml(char *buf, size_t size, struct nft_expr_cmp *cmp) ret =snprintf (buf+offset, len,"</cmpdata>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + ret =snprintf (buf+offset, len,"<expr_flags>%u</expr_flags>" , + e->flags); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +return offset; }static int nft_rule_expr_cmp_snprintf_default (char *buf,size_t size, -struct nft_expr_cmp *cmp) +struct nft_rule_expr *e) { +struct nft_expr_cmp *cmp = (struct nft_expr_cmp *)e->data;int len = size, offset =0 , ret; ret = snprintf(buf, len, "sreg=%u op=%s data=",
@@ -206,12 +212,11 @@ static int nft_rule_expr_cmp_snprintf(char *buf, size_t size, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { -struct nft_expr_cmp *cmp = (struct nft_expr_cmp *)e->data;switch (type) {case NFT_RULE_O_XML : -return nft_rule_expr_cmp_snprintf_xml (buf, size, cmp); +return nft_rule_expr_cmp_snprintf_xml (buf, size, e);case NFT_RULE_O_DEFAULT : -return nft_rule_expr_cmp_snprintf_default (buf, size, cmp); +return nft_rule_expr_cmp_snprintf_default (buf, size, e);default :break ; }
src/expr/counter.c +4 -2
@@ -133,8 +133,10 @@ nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type,switch (type) {case NFT_RULE_O_XML : -return snprintf (buf, len,"<pkts>%lu</pkts><bytes>%lu</bytes>" , - ctr->pkts, ctr->bytes); +return snprintf (buf, len,"<pkts>%lu</pkts>" +"<bytes>%lu</bytes>" +"<expr_flags>%u</expr_flags>" , + ctr->pkts, ctr->bytes, e->flags);case NFT_RULE_O_DEFAULT :return snprintf (buf, len,"pkts=%lu bytes=%lu " , ctr->pkts, ctr->bytes);
src/expr/immediate.c +4 -0
@@ -226,6 +226,10 @@ nft_rule_expr_immediate_snprintf_xml(char *buf, size_t len, ret =snprintf (buf+offset, len,"</immediatedata>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + ret =snprintf (buf+offset, len,"<expr_flags>%u</expr_flags>" , + e->flags); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +return offset; }
src/expr/lookup.c +9 -8
@@ -152,12 +152,14 @@ nft_rule_expr_lookup_parse(struct nft_rule_expr *e, struct nlattr *attr)static int nft_rule_expr_lookup_snprintf_xml (char *buf,size_t size, -struct nft_expr_lookup *l) +struct nft_rule_expr *e) { +struct nft_expr_lookup *l = (struct nft_expr_lookup *)e->data;int len = size, offset =0 , ret; - ret =snprintf (buf, len,"<set>%s</set><sreg>%u</sreg><dreg>%u</dreg>" , - l->set_name, l->sreg, l->dreg); + ret =snprintf (buf, len,"<set>%s</set><sreg>%u</sreg><dreg>%u</dreg>" +"<expr_flags>%u</expr_flags>" , + l->set_name, l->sreg, l->dreg, e->flags);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);return offset;
@@ -165,8 +167,9 @@ nft_rule_expr_lookup_snprintf_xml(char *buf, size_t size,static int nft_rule_expr_lookup_snprintf_default (char *buf,size_t size, -struct nft_expr_lookup *l) +struct nft_rule_expr *e) { +struct nft_expr_lookup *l = (struct nft_expr_lookup *)e->data;int len = size, offset =0 , ret; ret = snprintf(buf, len, "set=%s sreg=%u dreg=%u\n",
@@ -180,13 +183,11 @@ static int nft_rule_expr_lookup_snprintf(char *buf, size_t size, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { -struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data; -switch (type) {case NFT_RULE_O_XML : -return nft_rule_expr_lookup_snprintf_xml (buf, size, lookup); +return nft_rule_expr_lookup_snprintf_xml (buf, size, e);case NFT_RULE_O_DEFAULT : -return nft_rule_expr_lookup_snprintf_default (buf, size, lookup); +return nft_rule_expr_lookup_snprintf_default (buf, size, e);default :break ; }
src/expr/match.c +6 -2
@@ -186,8 +186,9 @@ static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *attstatic int nft_rule_expr_match_snprintf_xml (char *buf,size_t len, -struct nft_expr_match *mt) +struct nft_rule_expr *e) { +struct nft_expr_match *mt = (struct nft_expr_match *)e->data;int ret, size=len;int i;int offset =0 ;
@@ -205,6 +206,9 @@ int nft_rule_expr_match_snprintf_xml(char *buf, size_t len, ret =snprintf (buf+offset, len,"</info>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + ret =snprintf (buf+offset, len,"<expr_flags>%u</expr_flags>" , e->flags); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +return offset; }
@@ -217,7 +221,7 @@ nft_rule_expr_match_snprintf(char *buf, size_t len, uint32_t type,switch (type) {case NFT_RULE_O_XML : -return nft_rule_expr_match_snprintf_xml (buf, len, match); +return nft_rule_expr_match_snprintf_xml (buf, len, e);case NFT_RULE_O_DEFAULT :return snprintf (buf, len,"name=%s rev=%u " , match->name, match->rev);
src/expr/meta.c +3 -2
@@ -134,8 +134,9 @@ nft_rule_expr_meta_snprintf(char *buf, size_t len, uint32_t type,switch (type) {case NFT_RULE_O_XML :return snprintf (buf, len,"<dreg>%u</dreg>" -"<key>%u</key>" , - meta->dreg, meta->key); +"<key>%u</key>" +"<expr_flags>%u</expr_flags>" , + meta->dreg, meta->key, e->flags);case NFT_RULE_O_DEFAULT :return snprintf (buf, len,"dreg=%u key=%u " , meta->dreg, meta->key);
src/expr/nat.c +4 -0
@@ -239,6 +239,10 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size,SNPRINTF_BUFFER_SIZE (ret, size, len, offset); } + ret =snprintf (buf, len,"<expr_flags>%u</expr_flags>" , + e->flags); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +return offset; }
src/expr/payload.c +3 -2
@@ -174,9 +174,10 @@ nft_rule_expr_payload_snprintf(char *buf, size_t len, uint32_t type,case NFT_RULE_O_XML :return snprintf (buf, len,"<dreg>%u</dreg>" "<base>%u</base><offset>%u</offset>" -"<len>%u</len>" , +"<len>%u</len>" +"<expr_flags>%u</expr_flags>" , payload->dreg, payload->base, - payload->offset, payload->len); + payload->offset, payload->len, e->flags);case NFT_RULE_O_DEFAULT : return snprintf(buf, len, "dreg=%u base=%u offset=%u len=%u ",
src/expr/target.c +7 -2
@@ -186,8 +186,9 @@ static int nft_rule_expr_target_parse(struct nft_rule_expr *e, struct nlattr *atstatic int nft_rule_exp_target_snprintf_xml (char *buf,size_t len, -struct nft_expr_target *tg) +struct nft_rule_expr *e) { +struct nft_expr_target *tg = (struct nft_expr_target *)e->data;int ret, size=len;int i;int offset =0 ;
@@ -205,6 +206,10 @@ int nft_rule_exp_target_snprintf_xml(char *buf, size_t len, ret =snprintf (buf+offset, len,"</info>" );SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + ret =snprintf (buf+offset, len,"<expr_flags>%u</expr_flags>" , + e->flags); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +return offset; }
@@ -216,7 +221,7 @@ nft_rule_expr_target_snprintf(char *buf, size_t len, uint32_t type,switch (type) {case NFT_RULE_O_XML : -return nft_rule_exp_target_snprintf_xml (buf, len, target); +return nft_rule_exp_target_snprintf_xml (buf, len, e);case NFT_RULE_O_DEFAULT :return snprintf (buf, len,"name=%s rev=%u " , target->name, target->rev);
PATCH 5/5 src: support for XML parsing
In reply to Arturo BorreroThis patch adds capabilities for parsing a XML table/chain/rule
Some points to note:
* the XML data is case sensitive (so <chain>asd</chain> != <chain>ASD</chain> != <CHAIN>asd</CHAIN>)
* All XML nodes in each object must be present for the XML to be valid.
(following the format as printed by already included snprintf functions)
* The API functions will receive a XML and return an object (aka table|chain|rule)
* If error, -1 is returned. 0 if not. (you know, easily check if the parsing went OK).
Nice things you could achieve with this patch and all XML-related stuff in libnftables:
* Export the current ruleset (or just one object) in XML format.
* Edit a ruleset in XML.
* Validate a XML ruleset, or each object.
* Import to kernel a XML ruleset, or each object.
* Possibly (using third party apps), do some XML-to-Json and Json-to-XML conversions.
* Build even nicer stuff on top of it.
NOTE: expr/target and expr/match are working, but somewhat provisional. Actually a binary format, hard to deal within XML (at least for me).
Some code examples/test cases will be added to libnftables in a future patch.
--- Make_global.am | 2 configure.ac | 1 include/libnftables/chain.h | 1 include/libnftables/rule.h | 1 include/libnftables/table.h | 1 src/chain.c | 182 +++++++++++++++++++++++++++++++ src/expr/bitwise.c | 126 ++++++++++++++++++++++ src/expr/cmp.c | 120 +++++++++++++++++++++ src/expr/counter.c | 81 ++++++++++++++ src/expr/data_reg.c | 249 +++++++++++++++++++++++++++++++++++++++++++ src/expr/immediate.c | 110 +++++++++++++++++++ src/expr/lookup.c | 90 ++++++++++++++++ src/expr/match.c | 132 +++++++++++++++++++++++ src/expr/meta.c | 77 +++++++++++++ src/expr/nat.c | 147 +++++++++++++++++++++++++ src/expr/payload.c | 109 +++++++++++++++++++ src/expr/target.c | 133 +++++++++++++++++++++++ src/expr_ops.h | 1 src/libnftables.map | 3 + src/rule.c | 178 +++++++++++++++++++++++++++++++ src/table.c | 88 +++++++++++++++ 21 files changed, 1831 insertions(+), 1 deletion(-)
Make_global.am +1 -1
@@ -20,5 +20,5 @@ # LIBVERSION=0:0:0 -AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} +AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} ${LIBMXML_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
configure.ac +1 -0
@@ -14,6 +14,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Dependencies PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.0]) +PKG_CHECK_MODULES([LIBMXML], [mxml >= 2.6]) AC_PROG_CC AM_PROG_CC_C_O
include/libnftables/chain.h +1 -0
@@ -44,6 +44,7 @@ enum { NFT_CHAIN_O_XML, }; +int nft_chain_xml_parse (struct nft_chain *c,char *xml);int nft_chain_snprintf (char *buf,size_t size,struct nft_chain *t,uint32_t type,uint32_t flags);struct nlmsghdr *nft_chain_nlmsg_build_hdr (char *buf,uint16_t cmd,uint16_t family,uint16_t type,uint32_t seq);
include/libnftables/rule.h +1 -0
@@ -43,6 +43,7 @@ enum { NFT_RULE_O_XML, }; +int nft_rule_xml_parse (struct nft_rule *r,char *xml);int nft_rule_snprintf (char *buf,size_t size,struct nft_rule *t,uint32_t type,uint32_t flags);struct nlmsghdr *nft_rule_nlmsg_build_hdr (char *buf,uint16_t cmd,uint16_t family,uint16_t type,uint32_t seq);
include/libnftables/table.h +1 -0
@@ -31,6 +31,7 @@ enum { NFT_TABLE_O_XML, }; +int nft_table_xml_parse (struct nft_table *t,char *xml);int nft_table_snprintf (char *buf,size_t size,struct nft_table *t,uint32_t type,uint32_t flags);struct nlmsghdr *nft_table_nlmsg_build_hdr (char *buf,uint16_t cmd,uint16_t family,uint16_t type,uint32_t seq);
src/chain.c +182 -0
194 lines not on this page · raw message
src/expr/bitwise.c +126 -0
142 lines not on this page · raw message
src/expr/cmp.c +120 -0
136 lines not on this page · raw message
src/expr/counter.c +81 -0
97 lines not on this page · raw message
src/expr/data_reg.c +249 -0
264 lines not on this page · raw message
src/expr/immediate.c +110 -0
126 lines not on this page · raw message
src/expr/lookup.c +90 -0
106 lines not on this page · raw message
src/expr/match.c +132 -0
148 lines not on this page · raw message
src/expr/meta.c +77 -0
93 lines not on this page · raw message
src/expr/nat.c +147 -0
169 lines not on this page · raw message
src/expr/payload.c +109 -0
131 lines not on this page · raw message
src/expr/target.c +133 -0
149 lines not on this page · raw message
src/expr_ops.h +1 -0
@@ -17,6 +17,7 @@ struct expr_ops {int (*parse)(struct nft_rule_expr *e,struct nlattr *attr);void (*build)(struct nlmsghdr *nlh,struct nft_rule_expr *e);int (*snprintf)(char *buf,size_t len,uint32_t type,uint32_t flags,struct nft_rule_expr *e); +int (*xml_parse)(struct nft_rule_expr *e,char *xml); };struct expr_ops *nft_expr_ops_lookup (const char *name);
src/libnftables.map +3 -0
@@ -6,6 +6,7 @@ global: nft_table_attr_get; nft_table_attr_set_u32; nft_table_attr_get_u32; + nft_table_xml_parse; nft_table_snprintf; nft_table_nlmsg_build_hdr; nft_table_nlmsg_build_payload;
@@ -28,6 +29,7 @@ global: nft_chain_attr_get_s32; nft_chain_attr_get_u64; nft_chain_attr_get_str; + nft_chain_xml_parse; nft_chain_snprintf; nft_chain_nlmsg_build_hdr; nft_chain_nlmsg_build_payload;
@@ -51,6 +53,7 @@ global: nft_rule_attr_get_u32; nft_rule_attr_get_u64; nft_rule_attr_get_str; + nft_rule_xml_parse; nft_rule_snprintf; nft_rule_nlmsg_build_hdr; nft_rule_nlmsg_build_payload;
src/rule.c +178 -0
190 lines not on this page · raw message
src/table.c +88 -0
106 lines not on this page · raw message
--
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