[libnftnl PATCH 0/4] expr: ct: Do not print unset values in xml and json

[libnftnl PATCH 0/4] expr: ct: Do not print unset values in xml and json

[Ana Rey]

This patchset does tasks about does not print unset value in xml and json file
and about refactoring code:
 * expr: ct: Use nft_rule_expr_set_* in the xml parsing code
 * expr: ct: Delete the last comma character in json text.

Ana Rey (4):
  expr: ct: Use nft_rule_expr_set_* in the xml parsing code
  expr: ct: Do not print unset values in xml file
  expr: ct: Delete the last comma character in json text.
  expr: ct: Do not print unset values in json

 src/expr/ct.c | 92 ++++++++++++++++++++++++-----------------------------------
 1 file changed, 37 insertions(+), 55 deletions(-)

-- 
2.0.0

[libnftnl PATCH 1/4] expr: ct: Use nft_rule_expr_set_* in the xml parsing code

[Ana Rey]

Code refactoring to use nft_rule_expr_set_* in parse functions

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

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 38f5169..0f1c050 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -286,23 +286,18 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree
 				      struct nft_parse_err *err)
 {
 #ifdef XML_PARSING
-	struct nft_expr_ct *ct = nft_expr_data(e);
 	const char *key_str, *dir_str;
 	int key;
 	uint8_t dir;
-	uint32_t reg;
+	uint32_t dreg, sreg;
 
-	if (nft_mxml_reg_parse(tree, "dreg", &reg, MXML_DESCEND_FIRST,
-			       NFT_XML_OPT, err) >= 0) {
-		ct->dreg = reg;
-		e->flags |= (1 << NFT_EXPR_CT_DREG);
-	}
+	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST,
+			       NFT_XML_OPT, err) >= 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, dreg);
 
-	if (nft_mxml_reg_parse(tree, "sreg", &reg, MXML_DESCEND_FIRST,
-			       NFT_XML_OPT, err) >= 0) {
-		ct->sreg = reg;
-		e->flags |= (1 << NFT_EXPR_CT_SREG);
-	}
+	if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
+			       NFT_XML_OPT, err) >= 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_CT_SREG, sreg);
 
 	key_str = nft_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST,
 				     NFT_XML_MAND, err);
@@ -313,8 +308,7 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree
 	if (key < 0)
 		goto err;
 
-	ct->key = key;
-	e->flags |= (1 << NFT_EXPR_CT_KEY);
+	nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key);
 
 	dir_str = nft_mxml_str_parse(tree, "dir", MXML_DESCEND_FIRST,
 				     NFT_XML_OPT, err);
-- 
2.0.0

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

[Ana Rey]

It changes the parse and snprintf functions to omit unset values.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/ct.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 0f1c050..49fe238 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -292,24 +292,20 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree
 	uint32_t dreg, sreg;
 
 	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST,
-			       NFT_XML_OPT, err) >= 0)
+			       NFT_XML_OPT, err) == 0)
 		nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, dreg);
 
 	if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
-			       NFT_XML_OPT, err) >= 0)
+			       NFT_XML_OPT, err) == 0)
 		nft_rule_expr_set_u32(e, NFT_EXPR_CT_SREG, sreg);
 
 	key_str = nft_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST,
 				     NFT_XML_MAND, err);
-	if (key_str == NULL)
-		return -1;
-
-	key = str2ctkey(key_str);
-	if (key < 0)
-		goto err;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key);
-
+	if (key_str != NULL) {
+		key = str2ctkey(key_str);
+		if (key >= 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key);
+	}
 	dir_str = nft_mxml_str_parse(tree, "dir", MXML_DESCEND_FIRST,
 				     NFT_XML_OPT, err);
 	if (dir_str != NULL) {
@@ -318,7 +314,6 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree
 			err->error = NFT_PARSE_EBADTYPE;
 			goto err;
 		}
-
 		nft_rule_expr_set_u8(e, NFT_EXPR_CT_DIR, dir);
 	}
 
@@ -373,23 +368,23 @@ nft_expr_ct_snprintf_xml(char *buf, size_t size, struct nft_rule_expr *e)
 	struct nft_expr_ct *ct = nft_expr_data(e);
 
 	if (e->flags & (1 << NFT_EXPR_CT_DREG)) {
-		ret = snprintf(buf+offset, len, "<dreg>%u</dreg>", ct->dreg);
+		ret = snprintf(buf + offset, len, "<dreg>%u</dreg>", ct->dreg);
 		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 	}
 
 	if (e->flags & (1 << NFT_EXPR_CT_SREG)) {
-		ret = snprintf(buf+offset, len, "<sreg>%u</sreg>", ct->sreg);
+		ret = snprintf(buf + offset, len, "<sreg>%u</sreg>", ct->sreg);
 		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 	}
 
 	if (e->flags & (1 << NFT_EXPR_CT_KEY)) {
-		ret = snprintf(buf+offset, len, "<key>%s</key>",
+		ret = snprintf(buf + offset, len, "<key>%s</key>",
 			       ctkey2str(ct->key));
 		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 	}
 
 	if (nft_rule_expr_is_set(e, NFT_EXPR_CT_DIR)) {
-		ret = snprintf(buf+offset, len, "<dir>%s</dir>",
+		ret = snprintf(buf + offset, len, "<dir>%s</dir>",
 			       ctdir2str(ct->dir));
 		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 	}
-- 
2.0.0

[libnftnl PATCH 3/4] expr: ct: Delete the last comma character in json text.

[Ana Rey]

Code refactoring to delete correctly the last comma character in json text.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/ct.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 49fe238..f2718f9 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -356,9 +356,10 @@ nft_expr_ct_snprintf_json(char *buf, size_t size, struct nft_rule_expr *e)
 	}
 
 	/* Remove the last separator characther  */
-	buf[offset-1] = '\0';
+	if (offset > 0)
+		offset--;
 
-	return offset-1;
+	return offset;
 }
 
 static int
-- 
2.0.0

[libnftnl PATCH 4/4] expr: ct: Do not print unset values in json

[Ana Rey]

It changes the parse functions to omit unset values.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/ct.c | 44 ++++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/expr/ct.c b/src/expr/ct.c
index f2718f9..28ac13b 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -231,44 +231,36 @@ static int nft_rule_expr_ct_json_parse(struct nft_rule_expr *e, json_t *root,
 	int key;
 
 	if (nft_jansson_node_exist(root, "dreg")) {
-		if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg, err) < 0)
-			return -1;
-
-		nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, reg);
+		if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg,
+					  err) == 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, reg);
 	}
 
 	if (nft_jansson_node_exist(root, "sreg")) {
-		if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg, err) < 0)
-			return -1;
-
-		nft_rule_expr_set_u32(e, NFT_EXPR_CT_SREG, reg);
+		if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg,
+					  err) == 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_CT_SREG, reg);
 	}
 
 	if (nft_jansson_node_exist(root, "key")) {
 		key_str = nft_jansson_parse_str(root, "key", err);
-		if (key_str == NULL)
-			return -1;
-
-		key = str2ctkey(key_str);
-		if (key < 0)
-			goto err;
-
-		nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key);
-
+		if (key_str != NULL) {
+			key = str2ctkey(key_str);
+			if (key >= 0)
+				nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key);
+		}
 	}
 
 	if (nft_jansson_node_exist(root, "dir")) {
 		dir_str = nft_jansson_parse_str(root, "dir", err);
-		if (dir_str == NULL)
-			return -1;
-
-		if (str2ctdir(dir_str, &dir) != 0) {
-			err->node_name = "dir";
-			err->error = NFT_PARSE_EBADTYPE;
-			goto err;
-		}
-
+		if (dir_str != NULL) {
+			if (str2ctdir(dir_str, &dir) != 0) {
+				err->node_name = "dir";
+				err->error = NFT_PARSE_EBADTYPE;
+				goto err;
+			}
 		nft_rule_expr_set_u8(e, NFT_EXPR_CT_DIR, dir);
+		}
 	}
 
 	return 0;
-- 
2.0.0

[libnftnl PATCH 4/4] expr: ct: Do not print unset values in json

[Ana Rey]

It changes the parse functions to omit unset values.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/ct.c | 44 ++++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/expr/ct.c b/src/expr/ct.c
index f2718f9..28ac13b 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -231,44 +231,36 @@ static int nft_rule_expr_ct_json_parse(struct nft_rule_expr *e, json_t *root,
 	int key;
 
 	if (nft_jansson_node_exist(root, "dreg")) {
-		if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg, err) < 0)
-			return -1;
-
-		nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, reg);
+		if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg,
+					  err) == 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, reg);
 	}
 
 	if (nft_jansson_node_exist(root, "sreg")) {
-		if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg, err) < 0)
-			return -1;
-
-		nft_rule_expr_set_u32(e, NFT_EXPR_CT_SREG, reg);
+		if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg,
+					  err) == 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_CT_SREG, reg);
 	}
 
 	if (nft_jansson_node_exist(root, "key")) {
 		key_str = nft_jansson_parse_str(root, "key", err);
-		if (key_str == NULL)
-			return -1;
-
-		key = str2ctkey(key_str);
-		if (key < 0)
-			goto err;
-
-		nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key);
-
+		if (key_str != NULL) {
+			key = str2ctkey(key_str);
+			if (key >= 0)
+				nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key);
+		}
 	}
 
 	if (nft_jansson_node_exist(root, "dir")) {
 		dir_str = nft_jansson_parse_str(root, "dir", err);
-		if (dir_str == NULL)
-			return -1;
-
-		if (str2ctdir(dir_str, &dir) != 0) {
-			err->node_name = "dir";
-			err->error = NFT_PARSE_EBADTYPE;
-			goto err;
-		}
-
+		if (dir_str != NULL) {
+			if (str2ctdir(dir_str, &dir) != 0) {
+				err->node_name = "dir";
+				err->error = NFT_PARSE_EBADTYPE;
+				goto err;
+			}
 		nft_rule_expr_set_u8(e, NFT_EXPR_CT_DIR, dir);
+		}
 	}
 
 	return 0;
-- 
2.0.0