From 443410dd335732dbcb2a6f1524d7481e506d67c1 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Wed, 26 Jun 2013 13:37:21 +0200 Subject: exthdr: xml: rename type node to exthdr_type This patch renames the node in the exthdr expr to . Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/expr/exthdr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c index c174bc2..a31f079 100644 --- a/src/expr/exthdr.c +++ b/src/expr/exthdr.c @@ -260,8 +260,9 @@ nft_rule_expr_exthdr_xml_parse(struct nft_rule_expr *e, char *xml) exthdr->dreg = tmp; e->flags |= (1 << NFT_EXPR_EXTHDR_DREG); - /* Get and set */ - node = mxmlFindElement(tree, tree, "type", NULL, NULL, MXML_DESCEND); + /* Get and set */ + node = mxmlFindElement(tree, tree, "exthdr_type", NULL, NULL, + MXML_DESCEND); if (node == NULL) { mxmlDelete(tree); return -1; @@ -326,7 +327,8 @@ nft_rule_expr_exthdr_snprintf(char *buf, size_t len, uint32_t type, switch(type) { case NFT_RULE_O_XML: return snprintf(buf, len, "%u" - "%s%u" + "%s" + "%u" "%u", exthdr->dreg, exthdr_type2str(exthdr->type), -- cgit v1.2.3