From 8cb249d46fd38c7ff6ebdbbd2e75862771e3b8a5 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Fri, 13 Jun 2014 14:08:28 +0200 Subject: expr: nat: Do not print unset values in xml file It changes the parse functions to omit unset values. Now, It possible to use a xml file like this: [...] snat ip 1 1 Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/nat.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/expr/nat.c b/src/expr/nat.c index 46d5ed7..c10f0ff 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -283,24 +283,20 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre nft_rule_expr_set_u32(e, NFT_EXPR_NAT_FAMILY, family); if (nft_mxml_reg_parse(tree, "sreg_addr_min", ®_addr_min, - MXML_DESCEND, NFT_XML_MAND, err) < 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MIN, reg_addr_min); + MXML_DESCEND, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MIN, reg_addr_min); if (nft_mxml_reg_parse(tree, "sreg_addr_max", ®_addr_max, - MXML_DESCEND, NFT_XML_MAND, err) < 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MAX, reg_addr_max); + MXML_DESCEND, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MAX, reg_addr_max); if (nft_mxml_reg_parse(tree, "sreg_proto_min", ®_proto_min, - MXML_DESCEND, NFT_XML_MAND, err) < 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MIN, reg_proto_min); + MXML_DESCEND, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MIN, reg_proto_min); if (nft_mxml_reg_parse(tree, "sreg_proto_max", ®_proto_max, - MXML_DESCEND, NFT_XML_MAND, err) < 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg_proto_max); + MXML_DESCEND, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg_proto_max); return 0; #else -- cgit v1.2.3