diff options
| author | Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> | 2013-06-26 13:37:04 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-06-27 19:36:29 +0200 |
| commit | 6257f80b75f39730721df88256b698a8522f8857 (patch) | |
| tree | 6ca6a9a2087d45cb6bb52ecfda3a0ffd6cbb8831 | |
| parent | 2c34e9efb30606d5d649addb7c6c74ece0a9839e (diff) | |
nat: xml: fix node names for sreg_addr_{min|max}
This patch changes the name of XML nodes from <sreg_addr_min_v4> to
<sreg_addr_min>, and <sreg_addr_max_v4> to <sreg_addr_max>, as they
are register numbers, not addresses, so they are protocol independent.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/expr/nat.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 <sreg_addr_min_v4>. Not mandatory */ - node = mxmlFindElement(tree, tree, "sreg_addr_min_v4", NULL, NULL, + /* Get and set <sreg_addr_min>. 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 <sreg_addr_max_v4>. Not mandatory */ - node = mxmlFindElement(tree, tree, "sreg_addr_max_v4", NULL, NULL, + /* Get and set <sreg_addr_max>. 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, - "<sreg_addr_min_v4>%u</sreg_addr_min_v4>" - "<sreg_addr_max_v4>%u</sreg_addr_max_v4>", + "<sreg_addr_min>%u</sreg_addr_min>" + "<sreg_addr_max>%u</sreg_addr_max>", nat->sreg_addr_min, nat->sreg_addr_max); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } |