src: rule: fix compat XML output
PATCH 1/1 src: rule: fix compat XML output
The compat struct was not printed in XML. So, I think give output format is the first step to parse it.
--- src/rule.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
src/rule.c +8 -1
@@ -445,11 +445,18 @@ 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\"> " , +"chain=\"%s\" handle=\"%llu\">\n " , r->family, r->table, r->chain, (unsigned long long )r->handle);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); + ret =snprintf (buf+offset, len,"<rule_flags>%u</rule_flags>" +"<compat_flags>%u</compat_flags>" +"<compat_proto>%u</compat_proto>" , + r->rule_flags, + r->compat.flags, r->compat.proto); +SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +list_for_each_entry (expr, &r->expr_list, head) { ret =snprintf (buf+offset, len,"\n\t<expr type=\"%s\">\n" , expr->ops->name);
Pablo Neira Ayuso
maintainerHi Arturo,
Quoted 11 lines · Arturo Borrero
The compat struct was not printed in XML. So, I think give output format is the first step to parse it.
--- src/rule.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)src/rule.c +0
-0
src/rule.c static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r, · line 448
Quoted 5 lines
src/rule.c +1
-1@@ -445,11 +445,18 @@ 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\"> ", + "chain=\"%s\" handle=\"%llu\">\n ",
^^^
We don't need the space after ">" and the \n and the extra formatting.
As example, check the output of conntrack in XML:
# conntrack -L -o xml <?xml version="1.0" encoding="utf-8"?> <conntrack> <flow type="new"><meta direction="original"><layer3 protonum="2" protoname="ipv4"><src>77.209.70.77</src><dst>150.214.142.14</dst></layer3><layer4 protonum="1" protoname="icmp"></layer4></meta><meta direction="reply"><layer3 protonum="2" protoname="ipv4"><src>150.214.142.14</src><dst>77.209.70.77</dst></layer3><layer4 protonum="1" protoname="icmp"></layer4></meta><meta direction="independent"><timeout>30</timeout><id>830164440</id><unreplied/></meta></flow> <flow type="update"><meta direction="original"><layer3 protonum="2" protoname="ipv4"><src>77.209.70.77</src><dst>150.214.142.14</dst></layer3><layer4 protonum="1" protoname="icmp"></layer4></meta><meta direction="reply"><layer3 protonum="2" protoname="ipv4"><src>150.214.142.14</src><dst>77.209.70.77</dst></layer3><layer4 protonum="1" protoname="icmp"></layer4></meta><meta direction="independent"><timeout>29</timeout><id>830164440</id></meta></flow> </conntrack>
Note that every flow is expressed in one single line in XML.
Now do:
# conntrack -L -o xml > /tmp/x.xml
And have a look at some XML visualizer, eg:
$ firefox /tmp/x.xml
Does it clarify?
2013/4/9 Pablo Neira Ayuso <[email protected]>:
Quoted 2 lines
Does it clarify?
I agree with you.
If you choose to commit this, I will patch (out) all XML extra formatting (newlines, tabs...).
--
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
Quoted 8 lines · Arturo Borrero Gonzalez
2013/4/9 Pablo Neira Ayuso <[email protected]>:
Quoted 2 lines
Does it clarify?
I agree with you.
If you choose to commit this, I will patch (out) all XML extra formatting (newlines, tabs...).
I have applied this, as you sent already a major follow-up to address all formatting XML issues.