From 6257f80b75f39730721df88256b698a8522f8857 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Wed, 26 Jun 2013 13:37:04 +0200 Subject: nat: xml: fix node names for sreg_addr_{min|max} This patch changes the name of XML nodes from to , and to , as they are register numbers, not addresses, so they are protocol independent. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/expr/nat.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/expr/nat.c b/src/expr/nat.c index e838317..7050c23 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -264,8 +264,8 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml) nat->family = family; e->flags |= (1 << NFT_EXPR_NAT_FAMILY); - /* Get and set . Not mandatory */ - node = mxmlFindElement(tree, tree, "sreg_addr_min_v4", NULL, NULL, + /* Get and set . Not mandatory */ + node = mxmlFindElement(tree, tree, "sreg_addr_min", NULL, NULL, MXML_DESCEND); if (node != NULL) { tmp = strtoull(node->child->value.opaque, &endptr, 10); @@ -278,8 +278,8 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml) e->flags |= (1 << NFT_EXPR_NAT_REG_ADDR_MIN); } - /* Get and set . Not mandatory */ - node = mxmlFindElement(tree, tree, "sreg_addr_max_v4", NULL, NULL, + /* Get and set . Not mandatory */ + node = mxmlFindElement(tree, tree, "sreg_addr_max", NULL, NULL, MXML_DESCEND); if (node != NULL) { tmp = strtoull(node->child->value.opaque, &endptr, 10); @@ -350,8 +350,8 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size, if (e->flags & (1 << NFT_EXPR_NAT_REG_ADDR_MIN)) { ret = snprintf(buf+offset, len, - "%u" - "%u", + "%u" + "%u", nat->sreg_addr_min, nat->sreg_addr_max); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } -- cgit v1.2.3