[libnftnl PATCH 0/3] expr: nat: Do not print unset value

[libnftnl PATCH 0/3] expr: nat: Do not print unset value

[Ana Rey]

This patchset does tasks about does not print unset value in xml and json file
and about refactoring code: "Use nft_rule_expr_set_* in the xml"

Ana Rey (3):
  expr: nat: Use nft_rule_expr_set_* in the xml
  expr: nat: Do not print unset values in xml file
  expr: nat: Do not print unset values in json file

 src/expr/nat.c | 74 ++++++++++++++++++++--------------------------------------
 1 file changed, 25 insertions(+), 49 deletions(-)

-- 
2.0.0

[libnftnl PATCH 1/3] expr: nat: Use nft_rule_expr_set_* in the xml

[Ana Rey]

Code refactoring to use nft_rule_expr_set_* in parse xml functions. Also,
It renames some variables for code readability reasons and It converts some
variables from int to uint32_t.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/nat.c | 46 +++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/expr/nat.c b/src/expr/nat.c
index 42f2b49..46d5ed7 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -259,10 +259,10 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
 				       struct nft_parse_err *err)
 {
 #ifdef XML_PARSING
-	struct nft_expr_nat *nat = nft_expr_data(e);
 	const char *nat_type;
-	int family, nat_type_value;
-	uint32_t reg;
+	uint32_t family, nat_type_value;
+	uint32_t reg_addr_min, reg_addr_max;
+	uint32_t reg_proto_min, reg_proto_max;
 
 	nat_type = nft_mxml_str_parse(tree, "type", MXML_DESCEND_FIRST,
 				      NFT_XML_MAND, err);
@@ -272,9 +272,7 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
 	nat_type_value = nft_str2nat(nat_type);
 	if (nat_type_value < 0)
 		return -1;
-
-	nat->type = nat_type_value;
-	e->flags |= (1 << NFT_EXPR_NAT_TYPE);
+	nft_rule_expr_set_u32(e, NFT_EXPR_NAT_TYPE, nat_type_value);
 
 	family = nft_mxml_family_parse(tree, "family", MXML_DESCEND_FIRST,
 				       NFT_XML_MAND, err);
@@ -282,37 +280,27 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
 		mxmlDelete(tree);
 		return -1;
 	}
+	nft_rule_expr_set_u32(e, NFT_EXPR_NAT_FAMILY, family);
 
-	nat->family = family;
-	e->flags |= (1 << NFT_EXPR_NAT_FAMILY);
-
-	if (nft_mxml_reg_parse(tree, "sreg_addr_min", &reg,
-			       MXML_DESCEND, NFT_XML_MAND, err) != 0)
+	if (nft_mxml_reg_parse(tree, "sreg_addr_min", &reg_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);
 
-	nat->sreg_addr_min = reg;
-	e->flags |= (1 << NFT_EXPR_NAT_REG_ADDR_MIN);
-
-	if (nft_mxml_reg_parse(tree, "sreg_addr_max", &reg,
-			       MXML_DESCEND, NFT_XML_MAND, err) != 0)
+	if (nft_mxml_reg_parse(tree, "sreg_addr_max", &reg_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);
 
-	nat->sreg_addr_max = reg;
-	e->flags |= (1 << NFT_EXPR_NAT_REG_ADDR_MAX);
-
-	if (nft_mxml_reg_parse(tree, "sreg_proto_min", &reg,
-			       MXML_DESCEND, NFT_XML_MAND, err) != 0)
+	if (nft_mxml_reg_parse(tree, "sreg_proto_min", &reg_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);
 
-	nat->sreg_proto_min = reg;
-	e->flags |= (1 << NFT_EXPR_NAT_REG_PROTO_MIN);
-
-	if (nft_mxml_reg_parse(tree, "sreg_proto_max", &reg,
-			       MXML_DESCEND, NFT_XML_MAND, err) != 0)
+	if (nft_mxml_reg_parse(tree, "sreg_proto_max", &reg_proto_max,
+			       MXML_DESCEND, NFT_XML_MAND, err) < 0)
 		return -1;
-
-	nat->sreg_proto_max = reg;
-	e->flags |= (1 << NFT_EXPR_NAT_REG_PROTO_MAX);
+	nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg_proto_max);
 
 	return 0;
 #else
-- 
2.0.0

[libnftnl PATCH 2/3] expr: nat: Do not print unset values in xml file

[Ana Rey]

It changes the parse functions to omit unset values.

Now, It possible to use a xml file like this:
[...]
<expr type="nat">
        <type>snat</type>
        <family>ip</family>
        <sreg_addr_min>1</sreg_addr_min>
        <sreg_addr_max>1</sreg_addr_max>
</expr></rule>

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/nat.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

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", &reg_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", &reg_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", &reg_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", &reg_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
-- 
2.0.0

[libnftnl PATCH 3/3] expr: nat: Do not print unset values in json file

[Ana Rey]

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>
---
 src/expr/nat.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/expr/nat.c b/src/expr/nat.c
index c10f0ff..0136fca 100644
--- 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
-- 
2.0.0