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

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

[Ana Rey]

This patchset does tasks about does not print unset values in xml and json file
and about refactoring code:
* "expr: payload: Use nft_rule_expr_set_* in the xml parsing code"
* "expr: payload: get a nft_rule_expr type in
    nft_rule_expr_payload_snprintf_* functions"

Ana Rey (4):
  expr: payload: Use nft_rule_expr_set_* in the xml parsing code
  expr: payload: get a nft_rule_expr type in
    nft_rule_expr_payload_snprintf_* functions
  expr: payload: Do not print unset values in xml file
  expr: payload: Do not print unset values in json file

 src/expr/payload.c | 129 +++++++++++++++++++++++++++--------------------------
 1 file changed, 66 insertions(+), 63 deletions(-)

-- 
2.0.0

[libnftnl PATCH 1/4] expr: payload: 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/payload.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/expr/payload.c b/src/expr/payload.c
index ad82015..90322c1 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -240,17 +240,15 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 				struct nft_parse_err *err)
 {
 #ifdef XML_PARSING
-	struct nft_expr_payload *payload = nft_expr_data(e);
 	const char *base_str;
 	int32_t base;
-	uint32_t reg;
+	uint32_t dreg, offset, len;
 
-	if (nft_mxml_reg_parse(tree, "dreg", &reg, MXML_DESCEND_FIRST,
+	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST,
 			       NFT_XML_MAND, err) != 0)
 		return -1;
 
-	payload->dreg = reg;
-	e->flags |= (1 << NFT_EXPR_PAYLOAD_DREG);
+	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, dreg);
 
 	base_str = nft_mxml_str_parse(tree, "base", MXML_DESCEND_FIRST,
 				      NFT_XML_MAND, err);
@@ -261,22 +259,19 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 	if (base < 0)
 		return -1;
 
-	payload->base = base;
-	e->flags |= (1 << NFT_EXPR_PAYLOAD_BASE);
+	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base);
 
 	if (nft_mxml_num_parse(tree, "offset", MXML_DESCEND_FIRST, BASE_DEC,
-			       &payload->offset, NFT_TYPE_U8,
-			       NFT_XML_MAND, err) != 0)
+			       &offset, NFT_TYPE_U32, NFT_XML_MAND, err) != 0)
 		return -1;
+	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, offset);
 
-	e->flags |= (1 << NFT_EXPR_PAYLOAD_OFFSET);
 
 	if (nft_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST, BASE_DEC,
-			       &payload->len, NFT_TYPE_U8,
-			       NFT_XML_MAND, err) != 0)
+			       &len, NFT_TYPE_U32, NFT_XML_MAND, err) != 0)
 		return -1;
+	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, len);
 
-	e->flags |= (1 << NFT_EXPR_PAYLOAD_LEN);
 	return 0;
 #else
 	errno = EOPNOTSUPP;
-- 
2.0.0

[libnftnl PATCH 2/4] expr: payload: get a nft_rule_expr type in nft_rule_expr_payload_snprintf_* functions.

[Ana Rey]

Code refactoring in nft_rule_expr_payload_snprintf_* functions to get a
nft_rule_expr type instead of nft_expr_payload type. The nft_rule_expr is
needed to check information into flags variables.

Moreover, It remanes a variable from 'p' to 'payload' for code
readability reasons.

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

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 90322c1..6c08e48 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -165,15 +165,17 @@ static const char *base2str(enum nft_payload_bases base)
 
 static int
 nft_rule_expr_payload_snprintf_json(char *buf, size_t len, uint32_t flags,
-				   struct nft_expr_payload *p)
+				   struct nft_rule_expr *e)
 {
+	struct nft_expr_payload *payload = nft_expr_data(e);
 	int size = len, offset = 0, ret;
 
 	ret = snprintf(buf, len, "\"dreg\":%u,"
 				 "\"offset\":%u,"
 				 "\"len\":%u,"
 				 "\"base\":\"%s\"",
-		       p->dreg, p->offset, p->len, base2str(p->base));
+		       payload->dreg, payload->offset, payload->len,
+		       base2str(payload->base));
 	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
 	return offset;
@@ -281,15 +283,17 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 
 static int
 nft_rule_expr_payload_snprintf_xml(char *buf, size_t len, uint32_t flags,
-				   struct nft_expr_payload *p)
+				   struct nft_rule_expr *e)
 {
+	struct nft_expr_payload *payload = nft_expr_data(e);
 	int size = len, offset = 0, ret;
 
 	ret = snprintf(buf, len, "<dreg>%u</dreg>"
 				 "<offset>%u</offset>"
 				 "<len>%u</len>"
 				 "<base>%s</base>",
-		       p->dreg, p->offset, p->len, base2str(p->base));
+		       payload->dreg, payload->offset, payload->len,
+		       base2str(payload->base));
 	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
 	return offset;
@@ -307,11 +311,9 @@ nft_rule_expr_payload_snprintf(char *buf, size_t len, uint32_t type,
 				payload->len, base2str(payload->base),
 				payload->offset, payload->dreg);
 	case NFT_OUTPUT_XML:
-		return nft_rule_expr_payload_snprintf_xml(buf, len, flags,
-							  payload);
+		return nft_rule_expr_payload_snprintf_xml(buf, len, flags, e);
 	case NFT_OUTPUT_JSON:
-		return nft_rule_expr_payload_snprintf_json(buf, len, flags,
-							  payload);
+		return nft_rule_expr_payload_snprintf_json(buf, len, flags, e);
 	default:
 		break;
 	}
-- 
2.0.0

[libnftnl PATCH 3/4] expr: payload: 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/payload.c | 54 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 6c08e48..3cf2362 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -247,32 +247,25 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 	uint32_t dreg, offset, len;
 
 	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST,
-			       NFT_XML_MAND, err) != 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, dreg);
+			       NFT_XML_MAND, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, dreg);
 
 	base_str = nft_mxml_str_parse(tree, "base", MXML_DESCEND_FIRST,
 				      NFT_XML_MAND, err);
-	if (base_str == NULL)
-		return -1;
-
-	base = nft_str2base(base_str);
-	if (base < 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base);
+	if (base_str != NULL) {
+		base = nft_str2base(base_str);
+		if (base >= 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base);
+	}
 
 	if (nft_mxml_num_parse(tree, "offset", MXML_DESCEND_FIRST, BASE_DEC,
-			       &offset, NFT_TYPE_U32, NFT_XML_MAND, err) != 0)
-		return -1;
-	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, offset);
+			       &offset, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, offset);
 
 
 	if (nft_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST, BASE_DEC,
-			       &len, NFT_TYPE_U32, NFT_XML_MAND, err) != 0)
-		return -1;
-	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, len);
+			       &len, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, len);
 
 	return 0;
 #else
@@ -288,13 +281,24 @@ nft_rule_expr_payload_snprintf_xml(char *buf, size_t len, uint32_t flags,
 	struct nft_expr_payload *payload = nft_expr_data(e);
 	int size = len, offset = 0, ret;
 
-	ret = snprintf(buf, len, "<dreg>%u</dreg>"
-				 "<offset>%u</offset>"
-				 "<len>%u</len>"
-				 "<base>%s</base>",
-		       payload->dreg, payload->offset, payload->len,
-		       base2str(payload->base));
-	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	if (e->flags & (1 << NFT_EXPR_PAYLOAD_DREG)) {
+		ret = snprintf(buf, len, "<dreg>%u</dreg>", payload->dreg);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_PAYLOAD_OFFSET)) {
+		ret = snprintf(buf + offset, len, "<offset>%u</offset>",
+			       payload->offset);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_PAYLOAD_LEN)) {
+		ret = snprintf(buf + offset, len, "<len>%u</len>", payload->len);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_PAYLOAD_BASE)) {
+		ret = snprintf(buf + offset, len, "<base>%s</base>",
+			       base2str(payload->base));
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
 
 	return offset;
 }
-- 
2.0.0

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

[Ana Rey]

It changes the parse functions to omit unset values.

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

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 3cf2362..3f89ca3 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -170,14 +170,25 @@ nft_rule_expr_payload_snprintf_json(char *buf, size_t len, uint32_t flags,
 	struct nft_expr_payload *payload = nft_expr_data(e);
 	int size = len, offset = 0, ret;
 
-	ret = snprintf(buf, len, "\"dreg\":%u,"
-				 "\"offset\":%u,"
-				 "\"len\":%u,"
-				 "\"base\":\"%s\"",
-		       payload->dreg, payload->offset, payload->len,
-		       base2str(payload->base));
-	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	if (e->flags & (1 << NFT_EXPR_PAYLOAD_DREG)) {
+		ret = snprintf(buf, len, "\"dreg\":%u,", payload->dreg);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_PAYLOAD_OFFSET)) {
+		ret = snprintf(buf + offset, len, "\"offset\":%u,",
+			       payload->offset);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_PAYLOAD_LEN)) {
+		ret = snprintf(buf + offset, len, "\"len\":%u,", payload->len);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_PAYLOAD_BASE)) {
+		ret = snprintf(buf + offset, len, "\"base\":\"%s\"",
+			       base2str(payload->base));
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
 	return offset;
 }
 
@@ -204,31 +215,22 @@ nft_rule_expr_payload_json_parse(struct nft_rule_expr *e, json_t *root,
 	uint32_t reg, uval32;
 	int base;
 
-	if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg, err) < 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, reg);
+	if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, reg);
 
 	base_str = nft_jansson_parse_str(root, "base", err);
-	if (base_str == NULL)
-		return -1;
-
-	base = nft_str2base(base_str);
-	if (base < 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base);
+	if (base_str != NULL) {
+		base = nft_str2base(base_str);
+		if (base >= 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base);
+	}
 
 	if (nft_jansson_parse_val(root, "offset", NFT_TYPE_U32, &uval32,
-				  err) < 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, uval32);
-
-	if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32, err) < 0)
-		return -1;
+				  err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, uval32);
 
-	nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, uval32);
+	if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, uval32);
 
 	return 0;
 #else
-- 
2.0.0

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

[Arturo Borrero Gonzalez]

On 22 June 2014 20:32, Ana Rey <anarey@gmail.com> wrote:
> This patchset does tasks about does not print unset values in xml and json file
> and about refactoring code:
> * "expr: payload: Use nft_rule_expr_set_* in the xml parsing code"
> * "expr: payload: get a nft_rule_expr type in
>     nft_rule_expr_payload_snprintf_* functions"
>
> Ana Rey (4):
>   expr: payload: Use nft_rule_expr_set_* in the xml parsing code
>   expr: payload: get a nft_rule_expr type in
>     nft_rule_expr_payload_snprintf_* functions
>   expr: payload: Do not print unset values in xml file
>   expr: payload: Do not print unset values in json file
>
>  src/expr/payload.c | 129 +++++++++++++++++++++++++++--------------------------
>  1 file changed, 66 insertions(+), 63 deletions(-)
>

Hi Ana,

series reviewed.

thanks.

-- 
Arturo Borrero González
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html