diff options
author | Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> | 2013-05-23 12:03:04 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-05-23 12:34:08 +0200 |
commit | 51370f0eedb1c8167ab2c340d2a53f0d9f02509c (patch) | |
tree | c3c59e1ecd89cad380204fec6a92cf418cfb5ca6 /src/expr/counter.c | |
parent | 3231f64ee7bc4ba56e814611f306320b48e9b91d (diff) |
src: add support for XML parsing
This patch adds capabilities for parsing a XML table/chain/rule.
Some comments:
* The XML data is case sensitive
(so <chain>asd</chain> != <chain>ASD</chain> != <CHAIN>asd</CHAIN>)
* All exported functions receive XML and return an object (table|chain|rule).
* To compile the lib with XML parsing support, run './configure --with-xml-parsing'
* XML parsing is done with libmxml (http://minixml.org). XML parsing depends
on this external lib, this dependency is optional at compile time.
NOTE: expr/target and expr/match binary data are exported.
[ Fixed to compile without --with-xml-parsing --pablo ]
Signed-off-by: Arturo Borrero González <arturo.borrero.glez@gmail.com>
Diffstat (limited to 'src/expr/counter.c')
-rw-r--r-- | src/expr/counter.c | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/src/expr/counter.c b/src/expr/counter.c index 550d56d..633db3e 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -12,6 +12,7 @@ #include <stdio.h> #include <stdint.h> #include <arpa/inet.h> +#include <errno.h> #include <linux/netfilter/nf_tables.h> @@ -126,6 +127,66 @@ nft_rule_expr_counter_parse(struct nft_rule_expr *e, struct nlattr *attr) } static int +nft_rule_expr_counter_xml_parse(struct nft_rule_expr *e, char *xml) +{ +#ifdef XML_PARSING + struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + char *endptr; + uint64_t tmp; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("counter", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* get and set <pkts>. Is not mandatory*/ + node = mxmlFindElement(tree, tree, "pkts", NULL, NULL, + MXML_DESCEND_FIRST); + if (node != NULL) { + tmp = strtoull(node->child->value.opaque, &endptr, 10); + if (tmp == UINT64_MAX || tmp < 0 || *endptr ) { + mxmlDelete(tree); + return -1; + } + + ctr->pkts = (uint64_t)tmp; + e->flags |= (1 << NFT_EXPR_CTR_PACKETS); + } + + /* get and set <bytes> */ + node = mxmlFindElement(tree, tree, "bytes", NULL, NULL, + MXML_DESCEND); + if (node != NULL) { + tmp = strtoull(node->child->value.opaque, &endptr, 10); + if (tmp == UINT64_MAX || tmp < 0 || *endptr) { + mxmlDelete(tree); + return -1; + } + + ctr->bytes = (uint64_t)tmp; + e->flags |= (1 << NFT_EXPR_CTR_BYTES); + } + + mxmlDelete(tree); + return 0; +#else + errno = EOPNOTSUPP; + return -1; +#endif +} + +static int nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { @@ -153,4 +214,5 @@ struct expr_ops expr_ops_counter = { .parse = nft_rule_expr_counter_parse, .build = nft_rule_expr_counter_build, .snprintf = nft_rule_expr_counter_snprintf, + .xml_parse = nft_rule_expr_counter_xml_parse, }; |