diff options
author | Arturo Borrero <arturo.borrero.glez@gmail.com> | 2013-07-26 14:22:03 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-26 14:54:10 +0200 |
commit | 44928cd546f00a73797a570dcaee44f0bfe5bea7 (patch) | |
tree | c69ee7a0333842ee4fd7df523c1a69d8d125f452 /src/mxml.c | |
parent | 986c098a1b7c3329d66a60838c1b304c993063f8 (diff) |
set: add XML parsing
Sets are now parsed, following this previous snprintf pattern:
<set>
<set_name>string</set_name>
<set_table>table</set_table>
<set_xml_version>int</set_xml_version>
<set_flags>uint32_t</set_flags>
<key_type>uint32_t</key_type>
<key_len>size_t</key_len>
<data_type>uint32_t</data_type>
<data_len>size_t</data_len>
<set_elem>
<set_elem_flags>uint32_t</set_elem_flags>
<set_elem_key>
<data_reg type="value">
<len></len>
<dataN></dataN>
</data_reg>
</set_elem_key>
<set_elem_data>
<data_reg type="xx">
[...]
</data_reg>
</set_elem_data>
</set_elem>
</set>
Signed-off-by: Arturo Borrero González <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/mxml.c')
-rw-r--r-- | src/mxml.c | 46 |
1 files changed, 46 insertions, 0 deletions
@@ -17,6 +17,7 @@ #include <linux/netfilter/nf_tables.h> #include <libnftables/rule.h> #include <libnftables/expr.h> +#include <libnftables/set.h> #ifdef XML_PARSING struct nft_rule_expr *nft_mxml_expr_parse(mxml_node_t *node) @@ -165,4 +166,49 @@ const char *nft_mxml_str_parse(mxml_node_t *tree, const char *node_name, return strdup(node->child->value.opaque); } +struct nft_set_elem *nft_mxml_set_elem_parse(mxml_node_t *node) +{ + mxml_node_t *save; + char *set_elem_str; + struct nft_set_elem *elem; + + if (node == NULL) + goto einval; + + if (strcmp(node->value.opaque, "set_elem") != 0) + goto einval; + + elem = nft_set_elem_alloc(); + if (elem == NULL) + goto enomem; + + /* This is a hack for mxml to print just the current node */ + save = node->next; + node->next = NULL; + + set_elem_str = mxmlSaveAllocString(node, MXML_NO_CALLBACK); + node->next = save; + + if (set_elem_str == NULL) { + free(elem); + goto enomem; + } + + if (nft_set_elem_parse(elem, NFT_SET_PARSE_XML, + set_elem_str) != 0) { + free(set_elem_str); + free(elem); + return NULL; + } + + free(set_elem_str); + + return elem; +einval: + errno = EINVAL; + return NULL; +enomem: + errno = ENOMEM; + return NULL; +} #endif |