expr: nat: Do not print unset values in json file

It changes the parse functions to omit unset values.

Now, It possible to use a xml file like this:
[...]
      {
        "type": "nat",
        "nat_type": "snat",
        "family": "ip",
        "sreg_addr_min": 1,
        "sreg_addr_max": 1,
      }

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/nat.c b/src/expr/nat.c
index c10f0ffa772df6c36e33e7bfab48c36c3c961e19..0136fca7556d5df8982c7f24908731fdef79722a 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -225,28 +225,20 @@ static int nft_rule_expr_nat_json_parse(struct nft_rule_expr *e, json_t *root,
        nft_rule_expr_set_u32(e, NFT_EXPR_NAT_FAMILY, val32);
 
        if (nft_jansson_parse_reg(root, "sreg_addr_min", NFT_TYPE_U32,
-                                 &reg, err) < 0)
-               return -1;
-
-       nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MIN, reg);
+                                 &reg, err) == 0)
+               nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MIN, reg);
 
        if (nft_jansson_parse_reg(root, "sreg_addr_max", NFT_TYPE_U32,
-                                 &reg, err) < 0)
-               return -1;
-
-       nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MAX, reg);
+                                 &reg, err) == 0)
+               nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MAX, reg);
 
        if (nft_jansson_parse_reg(root, "sreg_proto_min", NFT_TYPE_U32,
-                                 &reg, err) < 0)
-               return -1;
-
-       nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MIN, reg);
+                                 &reg, err) == 0)
+               nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MIN, reg);
 
        if (nft_jansson_parse_reg(root, "sreg_proto_max", NFT_TYPE_U32,
-                                 &reg, err) < 0)
-               return -1;
-
-       nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg);
+                                 &reg, err) == 0)
+               nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg);
 
        return 0;
 #else