From 2c34e9efb30606d5d649addb7c6c74ece0a9839e Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Wed, 26 Jun 2013 13:37:03 +0200 Subject: nat: xml: change nat types string to dnat/snat This patch replaces the string NFT_NAT_{S|D}NAT with {s|d}nat in the node. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/expr/nat.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'src/expr/nat.c') diff --git a/src/expr/nat.c b/src/expr/nat.c index 2061618..e838317 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -237,9 +237,9 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml) return -1; } - if (strcmp(node->child->value.opaque, "NFT_NAT_SNAT") == 0) { + if (strcmp(node->child->value.opaque, "snat") == 0) { nat->type = NFT_NAT_SNAT; - } else if (strcmp(node->child->value.opaque, "NFT_NAT_DNAT") == 0) { + } else if (strcmp(node->child->value.opaque, "dnat") == 0) { nat->type = NFT_NAT_DNAT; } else { mxmlDelete(tree); @@ -334,18 +334,15 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size, struct nft_expr_nat *nat = (struct nft_expr_nat *)e->data; int len = size, offset = 0, ret = 0; - switch (nat->type) { - case NFT_NAT_SNAT: - ret = snprintf(buf, len, - "NFT_NAT_SNAT"); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - break; - case NFT_NAT_DNAT: - ret = snprintf(buf, len, - "NFT_NAT_DNAT"); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - break; - } + /* Is a mandatory element. Provide a default, even empty */ + if (nat->type == NFT_NAT_SNAT) + ret = snprintf(buf, len, "snat"); + else if (nat->type == NFT_NAT_DNAT) + ret = snprintf(buf, len, "dnat"); + else + ret = snprintf(buf, len, "unknown"); + + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = snprintf(buf+offset, len, "%s", nft_family2str(nat->family)); -- cgit v1.2.3