From fc7d496788b8abb3f009b73898508032eced0c6c Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Tue, 6 Aug 2013 12:52:45 +0200 Subject: src: xml: delete unneeded XML prefixes This patch changes some XML nodes with prefixes, as the example below ilustrates. Before: After: Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 10 +++------- src/set.c | 14 +++++++------- src/set_elem.c | 27 ++++++++++++--------------- src/table.c | 4 ++-- tests/xmlfiles/01-table.xml | 2 +- tests/xmlfiles/02-table.xml | 2 +- tests/xmlfiles/20-rule-bitwise.xml | 2 +- tests/xmlfiles/21-rule-byteorder.xml | 2 +- tests/xmlfiles/22-rule-cmp.xml | 2 +- tests/xmlfiles/23-rule-counter.xml | 2 +- tests/xmlfiles/24-rule-ct.xml | 2 +- tests/xmlfiles/25-rule-exthdr.xml | 2 +- tests/xmlfiles/26-rule-immediate.xml | 2 +- tests/xmlfiles/27-rule-limit.xml | 2 +- tests/xmlfiles/28-rule-log.xml | 2 +- tests/xmlfiles/29-rule-lookup.xml | 2 +- tests/xmlfiles/30-rule-match.xml | 2 +- tests/xmlfiles/31-rule-meta.xml | 2 +- tests/xmlfiles/32-rule-nat6.xml | 2 +- tests/xmlfiles/33-rule-nat4.xml | 2 +- tests/xmlfiles/34-rule-payload.xml | 2 +- tests/xmlfiles/35-rule-target.xml | 2 +- tests/xmlfiles/36-rule-real.xml | 2 +- tests/xmlfiles/37-rule-real.xml | 2 +- tests/xmlfiles/38-rule-real.xml | 2 +- tests/xmlfiles/39-rule-real.xml | 2 +- tests/xmlfiles/40-rule-real.xml | 2 +- tests/xmlfiles/41-rule-real.xml | 2 +- tests/xmlfiles/42-rule-real.xml | 2 +- tests/xmlfiles/43-rule-real.xml | 2 +- tests/xmlfiles/44-rule-real.xml | 2 +- tests/xmlfiles/45-rule-real.xml | 2 +- tests/xmlfiles/46-rule-real.xml | 2 +- tests/xmlfiles/47-rule-real.xml | 2 +- tests/xmlfiles/48-rule-real.xml | 2 +- tests/xmlfiles/49-rule-real.xml | 2 +- tests/xmlfiles/50-rule-real.xml | 2 +- tests/xmlfiles/51-rule-real.xml | 2 +- tests/xmlfiles/52-rule-real.xml | 2 +- tests/xmlfiles/53-rule-real.xml | 2 +- tests/xmlfiles/54-rule-real.xml | 2 +- tests/xmlfiles/55-rule-real.xml | 2 +- tests/xmlfiles/56-rule-real.xml | 2 +- tests/xmlfiles/57-rule-real.xml | 2 +- tests/xmlfiles/58-rule-real.xml | 2 +- tests/xmlfiles/59-rule-real.xml | 2 +- tests/xmlfiles/60-rule-real.xml | 2 +- tests/xmlfiles/61-rule-real.xml | 2 +- tests/xmlfiles/62-rule-real.xml | 2 +- tests/xmlfiles/63-rule-real.xml | 2 +- tests/xmlfiles/64-rule-real.xml | 2 +- tests/xmlfiles/65-rule-real.xml | 2 +- tests/xmlfiles/66-rule-real.xml | 2 +- tests/xmlfiles/67-rule-real.xml | 2 +- tests/xmlfiles/68-rule-real.xml | 2 +- tests/xmlfiles/69-rule-real.xml | 2 +- tests/xmlfiles/70-rule-real.xml | 2 +- tests/xmlfiles/71-rule-real.xml | 2 +- tests/xmlfiles/72-rule-real.xml | 2 +- tests/xmlfiles/73-set.xml | 24 ++++++++++++------------ tests/xmlfiles/74-set.xml | 18 +++++++++--------- 61 files changed, 100 insertions(+), 107 deletions(-) diff --git a/src/rule.c b/src/rule.c index c223272..9d6a996 100644 --- a/src/rule.c +++ b/src/rule.c @@ -533,7 +533,7 @@ static int nft_rule_xml_parse(struct nft_rule *r, char *xml) r->flags |= (1 << NFT_RULE_ATTR_HANDLE); /* get and set */ - if (nft_mxml_num_parse(tree, "rule_flags", MXML_DESCEND_FIRST, + if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC, &r->rule_flags, NFT_TYPE_U32) != 0) { mxmlDelete(tree); return -1; @@ -669,13 +669,9 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r, ret = snprintf(buf, size, "%s" "%s
%s" - "%llu", + "%llu%u", nft_family2str(r->family), r->table, r->chain, - (unsigned long long)r->handle); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - - ret = snprintf(buf+offset, len, "%u", - r->rule_flags); + (unsigned long long)r->handle, r->rule_flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); if (r->compat.flags != 0 || r->compat.proto != 0) { diff --git a/src/set.c b/src/set.c index 364e649..eb90426 100644 --- a/src/set.c +++ b/src/set.c @@ -321,7 +321,7 @@ static int nft_set_xml_parse(struct nft_set *s, char *xml) if (strcmp(tree->value.opaque, "set") != 0) goto err; - name = nft_mxml_str_parse(tree, "set_name", MXML_DESCEND_FIRST); + name = nft_mxml_str_parse(tree, "name", MXML_DESCEND_FIRST); if (name == NULL) goto err; @@ -331,14 +331,14 @@ static int nft_set_xml_parse(struct nft_set *s, char *xml) s->name = name; s->flags |= (1 << NFT_SET_ATTR_NAME); - table = nft_mxml_str_parse(tree, "set_table", MXML_DESCEND_FIRST); + table = nft_mxml_str_parse(tree, "table", MXML_DESCEND_FIRST); if (table == NULL) goto err; if (s->table) xfree(s->table); - s->table = strdup(table); + s->table = table; s->flags |= (1 << NFT_SET_ATTR_TABLE); family = nft_mxml_family_parse(tree, "family", MXML_DESCEND_FIRST); @@ -349,7 +349,7 @@ static int nft_set_xml_parse(struct nft_set *s, char *xml) s->flags |= (1 << NFT_SET_ATTR_FAMILY); - if (nft_mxml_num_parse(tree, "set_flags", MXML_DESCEND_FIRST, + if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC, &s->set_flags, NFT_TYPE_U32) != 0) goto err; @@ -509,9 +509,9 @@ static int nft_set_snprintf_xml(char *buf, size_t size, struct nft_set *s, struct nft_set_elem *elem; ret = snprintf(buf, size, "%s" - "%s" - "%s" - "%u" + "%s
" + "%s" + "%u" "%u" "%u" "%u" diff --git a/src/set_elem.c b/src/set_elem.c index c9c9bd4..d99b65e 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -393,24 +393,24 @@ static int nft_set_elem_xml_parse(struct nft_set_elem *e, char *xml) goto err; } - if (nft_mxml_num_parse(tree, "set_elem_flags", MXML_DESCEND_FIRST, + if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC, &e->set_elem_flags, NFT_TYPE_U32) != 0) goto err; e->flags |= (1 << NFT_SET_ELEM_ATTR_FLAGS); - if (nft_mxml_data_reg_parse(tree, "set_elem_key", + if (nft_mxml_data_reg_parse(tree, "key", &e->key) != DATA_VALUE) goto err; e->flags |= (1 << NFT_SET_ELEM_ATTR_KEY); /* is not mandatory */ - node = mxmlFindElement(tree, tree, "set_elem_data", NULL, NULL, + node = mxmlFindElement(tree, tree, "data", NULL, NULL, MXML_DESCEND_FIRST); if (node != NULL && node->child != NULL) { - set_elem_data = nft_mxml_data_reg_parse(tree, "set_elem_data", + set_elem_data = nft_mxml_data_reg_parse(tree, "data", &e->data); switch (set_elem_data) { case DATA_VALUE: @@ -530,32 +530,29 @@ static int nft_set_elem_snprintf_xml(char *buf, size_t size, int ret, len = size, offset = 0; ret = snprintf(buf, size, "" - "%u", + "%u", e->set_elem_flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, size, ""); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = nft_data_reg_snprintf(buf+offset, len, &e->key, NFT_RULE_O_XML, flags, DATA_VALUE); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, size, ""); + ret = snprintf(buf+offset, size, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); if (e->flags & (1 << NFT_SET_ELEM_ATTR_DATA)) { - ret = snprintf(buf+offset, size, ""); + ret = snprintf(buf+offset, size, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = nft_data_reg_snprintf(buf+offset, len, &e->data, NFT_RULE_O_XML, flags, DATA_VALUE); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, size, ""); + ret = snprintf(buf+offset, size, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } else if (e->flags & (1 << NFT_SET_ELEM_ATTR_VERDICT)) { - ret = snprintf(buf+offset, size, ""); + ret = snprintf(buf+offset, size, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = nft_data_reg_snprintf(buf+offset, len, &e->data, @@ -563,17 +560,17 @@ static int nft_set_elem_snprintf_xml(char *buf, size_t size, DATA_VERDICT); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, size, ""); + ret = snprintf(buf+offset, size, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } else if (e->flags & (1 << NFT_SET_ELEM_ATTR_CHAIN)) { - ret = snprintf(buf+offset, size, ""); + ret = snprintf(buf+offset, size, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = nft_data_reg_snprintf(buf+offset, len, &e->data, NFT_RULE_O_XML, flags, DATA_CHAIN); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, size, ""); + ret = snprintf(buf+offset, size, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } diff --git a/src/table.c b/src/table.c index baad801..85993eb 100644 --- a/src/table.c +++ b/src/table.c @@ -249,7 +249,7 @@ static int nft_table_xml_parse(struct nft_table *t, char *xml) t->family = family; t->flags |= (1 << NFT_TABLE_ATTR_FAMILY); - if (nft_mxml_num_parse(tree, "table_flags", MXML_DESCEND, BASE_DEC, + if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND, BASE_DEC, &t->table_flags, NFT_TYPE_U32) != 0) goto err; @@ -349,7 +349,7 @@ static int nft_table_snprintf_json(char *buf, size_t size, struct nft_table *t) static int nft_table_snprintf_xml(char *buf, size_t size, struct nft_table *t) { return snprintf(buf, size, "%s%s" - "%d
", + "%d", t->name, nft_family2str(t->family), t->table_flags); } diff --git a/tests/xmlfiles/01-table.xml b/tests/xmlfiles/01-table.xml index 2aa6492..b15ce6b 100644 --- a/tests/xmlfiles/01-table.xml +++ b/tests/xmlfiles/01-table.xml @@ -1,5 +1,5 @@ filterip - 0 + 0
diff --git a/tests/xmlfiles/02-table.xml b/tests/xmlfiles/02-table.xml index fa18d32..c58a0fb 100644 --- a/tests/xmlfiles/02-table.xml +++ b/tests/xmlfiles/02-table.xml @@ -1,5 +1,5 @@ natip6 - 0 + 0
diff --git a/tests/xmlfiles/20-rule-bitwise.xml b/tests/xmlfiles/20-rule-bitwise.xml index 86b2c6a..9ce65bf 100644 --- a/tests/xmlfiles/20-rule-bitwise.xml +++ b/tests/xmlfiles/20-rule-bitwise.xml @@ -3,7 +3,7 @@ filter
INPUT 100 - 0 + 0 1 1 diff --git a/tests/xmlfiles/21-rule-byteorder.xml b/tests/xmlfiles/21-rule-byteorder.xml index b19380c..b9aa97e 100644 --- a/tests/xmlfiles/21-rule-byteorder.xml +++ b/tests/xmlfiles/21-rule-byteorder.xml @@ -3,7 +3,7 @@ test
test 1000 - 0 + 0 3 4 diff --git a/tests/xmlfiles/22-rule-cmp.xml b/tests/xmlfiles/22-rule-cmp.xml index aae6de9..77c8f81 100644 --- a/tests/xmlfiles/22-rule-cmp.xml +++ b/tests/xmlfiles/22-rule-cmp.xml @@ -3,7 +3,7 @@ filter
test 36 - 0 + 0 1 eq diff --git a/tests/xmlfiles/23-rule-counter.xml b/tests/xmlfiles/23-rule-counter.xml index 0c56f4a..870f9fe 100644 --- a/tests/xmlfiles/23-rule-counter.xml +++ b/tests/xmlfiles/23-rule-counter.xml @@ -3,7 +3,7 @@ filter
test 39 - 0 + 0 3 177 diff --git a/tests/xmlfiles/24-rule-ct.xml b/tests/xmlfiles/24-rule-ct.xml index f4d52c1..38edb4d 100644 --- a/tests/xmlfiles/24-rule-ct.xml +++ b/tests/xmlfiles/24-rule-ct.xml @@ -3,7 +3,7 @@ filter
INPUT 100 - 0 + 0 1 state diff --git a/tests/xmlfiles/25-rule-exthdr.xml b/tests/xmlfiles/25-rule-exthdr.xml index a29e857..ff42d62 100644 --- a/tests/xmlfiles/25-rule-exthdr.xml +++ b/tests/xmlfiles/25-rule-exthdr.xml @@ -3,7 +3,7 @@ filter
INPUT 100 - 0 + 0 1 mh diff --git a/tests/xmlfiles/26-rule-immediate.xml b/tests/xmlfiles/26-rule-immediate.xml index dee0e7a..8fd5308 100644 --- a/tests/xmlfiles/26-rule-immediate.xml +++ b/tests/xmlfiles/26-rule-immediate.xml @@ -3,7 +3,7 @@ filter
input 32 - 0 + 0 0 diff --git a/tests/xmlfiles/27-rule-limit.xml b/tests/xmlfiles/27-rule-limit.xml index 7596429..aa6d607 100644 --- a/tests/xmlfiles/27-rule-limit.xml +++ b/tests/xmlfiles/27-rule-limit.xml @@ -3,7 +3,7 @@ filter
INPUT 100 - 0 + 0 123123 321321 diff --git a/tests/xmlfiles/28-rule-log.xml b/tests/xmlfiles/28-rule-log.xml index 976b29c..eed61a6 100644 --- a/tests/xmlfiles/28-rule-log.xml +++ b/tests/xmlfiles/28-rule-log.xml @@ -3,7 +3,7 @@ filter
test 96 - 0 + 0 test_chain 1 diff --git a/tests/xmlfiles/29-rule-lookup.xml b/tests/xmlfiles/29-rule-lookup.xml index 0df7709..89928e3 100644 --- a/tests/xmlfiles/29-rule-lookup.xml +++ b/tests/xmlfiles/29-rule-lookup.xml @@ -3,7 +3,7 @@ filter
test 37 - 0 + 0 set0 1 diff --git a/tests/xmlfiles/30-rule-match.xml b/tests/xmlfiles/30-rule-match.xml index 817b88f..3346976 100644 --- a/tests/xmlfiles/30-rule-match.xml +++ b/tests/xmlfiles/30-rule-match.xml @@ -3,7 +3,7 @@ filter
INPUT 100 - 0 + 0 state diff --git a/tests/xmlfiles/31-rule-meta.xml b/tests/xmlfiles/31-rule-meta.xml index 1bce08b..0227e78 100644 --- a/tests/xmlfiles/31-rule-meta.xml +++ b/tests/xmlfiles/31-rule-meta.xml @@ -3,7 +3,7 @@ filter
test 36 - 0 + 0 1 iifname diff --git a/tests/xmlfiles/32-rule-nat6.xml b/tests/xmlfiles/32-rule-nat6.xml index a80b4d4..5d38ac5 100644 --- a/tests/xmlfiles/32-rule-nat6.xml +++ b/tests/xmlfiles/32-rule-nat6.xml @@ -3,7 +3,7 @@ nat
OUTPUT 100 - 0 + 0 ip6 snat diff --git a/tests/xmlfiles/33-rule-nat4.xml b/tests/xmlfiles/33-rule-nat4.xml index 05933af..6200ece 100644 --- a/tests/xmlfiles/33-rule-nat4.xml +++ b/tests/xmlfiles/33-rule-nat4.xml @@ -3,7 +3,7 @@ filter
INPUT 100 - 0 + 0 1 2 diff --git a/tests/xmlfiles/34-rule-payload.xml b/tests/xmlfiles/34-rule-payload.xml index bd344cc..9e48822 100644 --- a/tests/xmlfiles/34-rule-payload.xml +++ b/tests/xmlfiles/34-rule-payload.xml @@ -3,7 +3,7 @@ filter
test 34 - 0 + 0 1 2 diff --git a/tests/xmlfiles/35-rule-target.xml b/tests/xmlfiles/35-rule-target.xml index 914bb9a..3c84538 100644 --- a/tests/xmlfiles/35-rule-target.xml +++ b/tests/xmlfiles/35-rule-target.xml @@ -3,7 +3,7 @@ filter
INPUT 100 - 0 + 0 LOG diff --git a/tests/xmlfiles/36-rule-real.xml b/tests/xmlfiles/36-rule-real.xml index 5ba79b7..9178e2a 100644 --- a/tests/xmlfiles/36-rule-real.xml +++ b/tests/xmlfiles/36-rule-real.xml @@ -3,7 +3,7 @@ filter
output 22 - 0 + 0 1 12 diff --git a/tests/xmlfiles/37-rule-real.xml b/tests/xmlfiles/37-rule-real.xml index 42ea43a..ff7283b 100644 --- a/tests/xmlfiles/37-rule-real.xml +++ b/tests/xmlfiles/37-rule-real.xml @@ -3,7 +3,7 @@ filter
INPUT 25 - 0 + 0 1 iifname diff --git a/tests/xmlfiles/38-rule-real.xml b/tests/xmlfiles/38-rule-real.xml index 08de9d3..18c349c 100644 --- a/tests/xmlfiles/38-rule-real.xml +++ b/tests/xmlfiles/38-rule-real.xml @@ -3,7 +3,7 @@ filter
INPUT 30 - 0 + 0 1 16 diff --git a/tests/xmlfiles/39-rule-real.xml b/tests/xmlfiles/39-rule-real.xml index de1692c..f69ef62 100644 --- a/tests/xmlfiles/39-rule-real.xml +++ b/tests/xmlfiles/39-rule-real.xml @@ -3,7 +3,7 @@ filter
test 31 - 0 + 0 1 iifname diff --git a/tests/xmlfiles/40-rule-real.xml b/tests/xmlfiles/40-rule-real.xml index 944b1bd..2630023 100644 --- a/tests/xmlfiles/40-rule-real.xml +++ b/tests/xmlfiles/40-rule-real.xml @@ -3,7 +3,7 @@ filter
output 2 - 0 + 0 1 16 diff --git a/tests/xmlfiles/41-rule-real.xml b/tests/xmlfiles/41-rule-real.xml index de951f8..762a7d9 100644 --- a/tests/xmlfiles/41-rule-real.xml +++ b/tests/xmlfiles/41-rule-real.xml @@ -3,7 +3,7 @@ filter
output 3 - 0 + 0 1 16 diff --git a/tests/xmlfiles/42-rule-real.xml b/tests/xmlfiles/42-rule-real.xml index d528a38..4bd9c6a 100644 --- a/tests/xmlfiles/42-rule-real.xml +++ b/tests/xmlfiles/42-rule-real.xml @@ -3,7 +3,7 @@ filter
output 4 - 0 + 0 1 16 diff --git a/tests/xmlfiles/43-rule-real.xml b/tests/xmlfiles/43-rule-real.xml index 0e6381c..eda5938 100644 --- a/tests/xmlfiles/43-rule-real.xml +++ b/tests/xmlfiles/43-rule-real.xml @@ -3,7 +3,7 @@ filter
output 5 - 0 + 0 1 16 diff --git a/tests/xmlfiles/44-rule-real.xml b/tests/xmlfiles/44-rule-real.xml index a9fc698..e66098a 100644 --- a/tests/xmlfiles/44-rule-real.xml +++ b/tests/xmlfiles/44-rule-real.xml @@ -3,7 +3,7 @@ filter
output 6 - 0 + 0 1 16 diff --git a/tests/xmlfiles/45-rule-real.xml b/tests/xmlfiles/45-rule-real.xml index ed4645d..1684eb3 100644 --- a/tests/xmlfiles/45-rule-real.xml +++ b/tests/xmlfiles/45-rule-real.xml @@ -3,7 +3,7 @@ filter
output 7 - 0 + 0 1 9 diff --git a/tests/xmlfiles/46-rule-real.xml b/tests/xmlfiles/46-rule-real.xml index 56cb088..00db686 100644 --- a/tests/xmlfiles/46-rule-real.xml +++ b/tests/xmlfiles/46-rule-real.xml @@ -3,7 +3,7 @@ filter
output 8 - 0 + 0 1 9 diff --git a/tests/xmlfiles/47-rule-real.xml b/tests/xmlfiles/47-rule-real.xml index 2ec3e19..caa247c 100644 --- a/tests/xmlfiles/47-rule-real.xml +++ b/tests/xmlfiles/47-rule-real.xml @@ -3,7 +3,7 @@ filter
output 9 - 0 + 0 1 12 diff --git a/tests/xmlfiles/48-rule-real.xml b/tests/xmlfiles/48-rule-real.xml index 36ca11b..1870646 100644 --- a/tests/xmlfiles/48-rule-real.xml +++ b/tests/xmlfiles/48-rule-real.xml @@ -3,7 +3,7 @@ filter
output 10 - 0 + 0 1 9 diff --git a/tests/xmlfiles/49-rule-real.xml b/tests/xmlfiles/49-rule-real.xml index ef968ac..021e461 100644 --- a/tests/xmlfiles/49-rule-real.xml +++ b/tests/xmlfiles/49-rule-real.xml @@ -3,7 +3,7 @@ filter
output 11 - 0 + 0 1 9 diff --git a/tests/xmlfiles/50-rule-real.xml b/tests/xmlfiles/50-rule-real.xml index 5b4bb2f..2ffa58a 100644 --- a/tests/xmlfiles/50-rule-real.xml +++ b/tests/xmlfiles/50-rule-real.xml @@ -3,7 +3,7 @@ filter
output 12 - 0 + 0 1 state diff --git a/tests/xmlfiles/51-rule-real.xml b/tests/xmlfiles/51-rule-real.xml index 1e5a46c..153b10f 100644 --- a/tests/xmlfiles/51-rule-real.xml +++ b/tests/xmlfiles/51-rule-real.xml @@ -3,7 +3,7 @@ filter
output 13 - 0 + 0 1 direction diff --git a/tests/xmlfiles/52-rule-real.xml b/tests/xmlfiles/52-rule-real.xml index 6cb3a0e..2c876b8 100644 --- a/tests/xmlfiles/52-rule-real.xml +++ b/tests/xmlfiles/52-rule-real.xml @@ -3,7 +3,7 @@ filter
output 14 - 0 + 0 1 direction diff --git a/tests/xmlfiles/53-rule-real.xml b/tests/xmlfiles/53-rule-real.xml index 1be6c89..4740d24 100644 --- a/tests/xmlfiles/53-rule-real.xml +++ b/tests/xmlfiles/53-rule-real.xml @@ -3,7 +3,7 @@ filter
output 15 - 0 + 0 1 status diff --git a/tests/xmlfiles/54-rule-real.xml b/tests/xmlfiles/54-rule-real.xml index caf9ebe..0e1616a 100644 --- a/tests/xmlfiles/54-rule-real.xml +++ b/tests/xmlfiles/54-rule-real.xml @@ -3,7 +3,7 @@ filter
output 16 - 0 + 0 1 mark diff --git a/tests/xmlfiles/55-rule-real.xml b/tests/xmlfiles/55-rule-real.xml index f452e50..3e0e308 100644 --- a/tests/xmlfiles/55-rule-real.xml +++ b/tests/xmlfiles/55-rule-real.xml @@ -3,7 +3,7 @@ filter
output 17 - 0 + 0 1 secmark diff --git a/tests/xmlfiles/56-rule-real.xml b/tests/xmlfiles/56-rule-real.xml index 3175803..6bd41a1 100644 --- a/tests/xmlfiles/56-rule-real.xml +++ b/tests/xmlfiles/56-rule-real.xml @@ -3,7 +3,7 @@ filter
output 18 - 0 + 0 1 expiration diff --git a/tests/xmlfiles/57-rule-real.xml b/tests/xmlfiles/57-rule-real.xml index 9c63ed4..da71196 100644 --- a/tests/xmlfiles/57-rule-real.xml +++ b/tests/xmlfiles/57-rule-real.xml @@ -3,7 +3,7 @@ filter
output 19 - 0 + 0 1 helper diff --git a/tests/xmlfiles/58-rule-real.xml b/tests/xmlfiles/58-rule-real.xml index 0ba27a8..4590d94 100644 --- a/tests/xmlfiles/58-rule-real.xml +++ b/tests/xmlfiles/58-rule-real.xml @@ -3,7 +3,7 @@ filter
output 20 - 0 + 0 1 len diff --git a/tests/xmlfiles/59-rule-real.xml b/tests/xmlfiles/59-rule-real.xml index 1305516..be6a32d 100644 --- a/tests/xmlfiles/59-rule-real.xml +++ b/tests/xmlfiles/59-rule-real.xml @@ -3,7 +3,7 @@ filter
output 21 - 0 + 0 1 protocol diff --git a/tests/xmlfiles/60-rule-real.xml b/tests/xmlfiles/60-rule-real.xml index d7db206..d653f3a 100644 --- a/tests/xmlfiles/60-rule-real.xml +++ b/tests/xmlfiles/60-rule-real.xml @@ -3,7 +3,7 @@ filter
output 22 - 0 + 0 1 mark diff --git a/tests/xmlfiles/61-rule-real.xml b/tests/xmlfiles/61-rule-real.xml index 0d21968..3a215de 100644 --- a/tests/xmlfiles/61-rule-real.xml +++ b/tests/xmlfiles/61-rule-real.xml @@ -3,7 +3,7 @@ filter
output 23 - 0 + 0 1 iif diff --git a/tests/xmlfiles/62-rule-real.xml b/tests/xmlfiles/62-rule-real.xml index 7f2aba2..115a938 100644 --- a/tests/xmlfiles/62-rule-real.xml +++ b/tests/xmlfiles/62-rule-real.xml @@ -3,7 +3,7 @@ filter
output 24 - 0 + 0 1 iifname diff --git a/tests/xmlfiles/63-rule-real.xml b/tests/xmlfiles/63-rule-real.xml index e632d51..1ebc450 100644 --- a/tests/xmlfiles/63-rule-real.xml +++ b/tests/xmlfiles/63-rule-real.xml @@ -3,7 +3,7 @@ filter
output 25 - 0 + 0 1 oif diff --git a/tests/xmlfiles/64-rule-real.xml b/tests/xmlfiles/64-rule-real.xml index 9e11132..f6ac959 100644 --- a/tests/xmlfiles/64-rule-real.xml +++ b/tests/xmlfiles/64-rule-real.xml @@ -3,7 +3,7 @@ filter
output 26 - 0 + 0 1 oifname diff --git a/tests/xmlfiles/65-rule-real.xml b/tests/xmlfiles/65-rule-real.xml index 3cbdd13..e1b4624 100644 --- a/tests/xmlfiles/65-rule-real.xml +++ b/tests/xmlfiles/65-rule-real.xml @@ -3,7 +3,7 @@ filter
output 27 - 0 + 0 1 skuid diff --git a/tests/xmlfiles/66-rule-real.xml b/tests/xmlfiles/66-rule-real.xml index 4790065..562a5e3 100644 --- a/tests/xmlfiles/66-rule-real.xml +++ b/tests/xmlfiles/66-rule-real.xml @@ -3,7 +3,7 @@ filter
output 28 - 0 + 0 1 skgid diff --git a/tests/xmlfiles/67-rule-real.xml b/tests/xmlfiles/67-rule-real.xml index c3413e2..2134627 100644 --- a/tests/xmlfiles/67-rule-real.xml +++ b/tests/xmlfiles/67-rule-real.xml @@ -3,7 +3,7 @@ filter
output 29 - 0 + 0 1 secmark diff --git a/tests/xmlfiles/68-rule-real.xml b/tests/xmlfiles/68-rule-real.xml index a63a51c..bc52f34 100644 --- a/tests/xmlfiles/68-rule-real.xml +++ b/tests/xmlfiles/68-rule-real.xml @@ -3,7 +3,7 @@ filter
output 32 - 0 + 0 1 9 diff --git a/tests/xmlfiles/69-rule-real.xml b/tests/xmlfiles/69-rule-real.xml index 02baab4..fa11b60 100644 --- a/tests/xmlfiles/69-rule-real.xml +++ b/tests/xmlfiles/69-rule-real.xml @@ -3,7 +3,7 @@ filter
output 33 - 0 + 0 1 16 diff --git a/tests/xmlfiles/70-rule-real.xml b/tests/xmlfiles/70-rule-real.xml index a459542..490ab67 100644 --- a/tests/xmlfiles/70-rule-real.xml +++ b/tests/xmlfiles/70-rule-real.xml @@ -3,7 +3,7 @@ filter
output 34 - 0 + 0 1 9 diff --git a/tests/xmlfiles/71-rule-real.xml b/tests/xmlfiles/71-rule-real.xml index 444b9ca..721e1ea 100644 --- a/tests/xmlfiles/71-rule-real.xml +++ b/tests/xmlfiles/71-rule-real.xml @@ -3,7 +3,7 @@ filter
output 35 - 0 + 0 1 9 diff --git a/tests/xmlfiles/72-rule-real.xml b/tests/xmlfiles/72-rule-real.xml index 64b4ec6..ddcc8be 100644 --- a/tests/xmlfiles/72-rule-real.xml +++ b/tests/xmlfiles/72-rule-real.xml @@ -3,7 +3,7 @@ filter
output 36 - 0 + 0 1 16 diff --git a/tests/xmlfiles/73-set.xml b/tests/xmlfiles/73-set.xml index 9c51548..e783dfa 100644 --- a/tests/xmlfiles/73-set.xml +++ b/tests/xmlfiles/73-set.xml @@ -1,38 +1,38 @@ - set0 - filter + set0 + filter
ip - 0 + 0 0 0 0 0 - 0 - + 0 + 4 0x0300a8c0 - + - 0 - + 0 + 4 0x0200a8c0 - + - 0 - + 0 + 4 0x0100a8c0 - + diff --git a/tests/xmlfiles/74-set.xml b/tests/xmlfiles/74-set.xml index 9bfb9f9..3ac19a3 100644 --- a/tests/xmlfiles/74-set.xml +++ b/tests/xmlfiles/74-set.xml @@ -1,15 +1,15 @@ - set0 - filter + set0 + filter
ip6 - 0 + 0 0 0 0 0 - 0 - + 0 + 16 0xc09a002a @@ -17,11 +17,11 @@ 0x00000000 0x70010000 - + - 0 - + 0 + 16 0xc09a002a @@ -29,7 +29,7 @@ 0x00000000 0x50010000 - + -- cgit v1.2.3