[libnftnl PATCH 0/5] expr: bitwise: Do not print unset values

[libnftnl PATCH 0/5] expr: bitwise: Do not print unset values

[Ana Rey]

This patchset does tasks about does not print unset value in xml and json file
and about refactoring code:

*"expr: byteorder: Get a nft_rule_expr type in
    nft_rule_expr_byteorder_snprintf_* functions"
* "expr: byteorder: Use nft_rule_expr_set_* in the xml parsing code"
* "expr: byteorder: Rename variables in
    nft_rule_expr_byteorder_json_parse functions"

*** BLURB HERE ***

Ana Rey (5):
  expr: byteorder: Get a nft_rule_expr type in
    nft_rule_expr_byteorder_snprintf_* functions
  expr: byteorder: Use nft_rule_expr_set_* in the xml parsing code
  expr: byteorder: Do not print unset values in xml file
  expr: byteorder: Rename variables in
    nft_rule_expr_byteorder_json_parse functions
  expr: byteorder: Do not print unset values in json

 src/expr/byteorder.c | 196 +++++++++++++++++++++++++++------------------------
 1 file changed, 102 insertions(+), 94 deletions(-)

-- 
2.0.0

[libnftnl PATCH 1/5] expr: byteorder: Get a nft_rule_expr type in nft_rule_expr_byteorder_snprintf_* functions

[Ana Rey]

Code refactoring in nft_rule_expr_byteorder_snprintf_* functions to get a
nft_rule_expr type instead of nft_expr_byorder type.

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

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 4889e80..e42d7b6 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -296,10 +296,10 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 #endif
 }
 
-static int
-nft_rule_expr_byteorder_snprintf_json(char *buf, size_t size,
-				       struct nft_expr_byteorder *byteorder)
+static int nft_rule_expr_byteorder_snprintf_json(char *buf, size_t size,
+						 struct nft_rule_expr *e)
 {
+	struct nft_expr_byteorder *byteorder = nft_expr_data(e);
 	int len = size, offset = 0, ret;
 
 	ret = snprintf(buf, len, "\"sreg\":%u,"
@@ -315,10 +315,10 @@ nft_rule_expr_byteorder_snprintf_json(char *buf, size_t size,
 	return offset;
 }
 
-static int
-nft_rule_expr_byteorder_snprintf_xml(char *buf, size_t size,
-				   struct nft_expr_byteorder *byteorder)
+static int nft_rule_expr_byteorder_snprintf_xml(char *buf, size_t size,
+						struct nft_rule_expr *e)
 {
+	struct nft_expr_byteorder *byteorder = nft_expr_data(e);
 	int len = size, offset = 0, ret;
 
 	ret = snprintf(buf, len, "<sreg>%u</sreg>"
@@ -334,10 +334,10 @@ nft_rule_expr_byteorder_snprintf_xml(char *buf, size_t size,
 	return offset;
 }
 
-static int
-nft_rule_expr_byteorder_snprintf_default(char *buf, size_t size,
-				       struct nft_expr_byteorder *byteorder)
+static int nft_rule_expr_byteorder_snprintf_default(char *buf, size_t size,
+						    struct nft_rule_expr *e)
 {
+	struct nft_expr_byteorder *byteorder = nft_expr_data(e);
 	int len = size, offset = 0, ret;
 
 	ret = snprintf(buf, len, "reg %u = %s(reg %u, %u, %u) ",
@@ -350,20 +350,15 @@ nft_rule_expr_byteorder_snprintf_default(char *buf, size_t size,
 
 static int
 nft_rule_expr_byteorder_snprintf(char *buf, size_t size, uint32_t type,
-			       uint32_t flags, struct nft_rule_expr *e)
+				 uint32_t flags, struct nft_rule_expr *e)
 {
-	struct nft_expr_byteorder *byteorder = nft_expr_data(e);
-
 	switch(type) {
 	case NFT_OUTPUT_DEFAULT:
-		return nft_rule_expr_byteorder_snprintf_default(buf, size,
-								byteorder);
+		return nft_rule_expr_byteorder_snprintf_default(buf, size, e);
 	case NFT_OUTPUT_XML:
-		return nft_rule_expr_byteorder_snprintf_xml(buf, size,
-							    byteorder);
+		return nft_rule_expr_byteorder_snprintf_xml(buf, size, e);
 	case NFT_OUTPUT_JSON:
-		return nft_rule_expr_byteorder_snprintf_json(buf, size,
-							    byteorder);
+		return nft_rule_expr_byteorder_snprintf_json(buf, size, e);
 	default:
 		break;
 	}
-- 
2.0.0

[libnftnl PATCH 2/5] expr: byteorder: 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/byteorder.c | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index e42d7b6..0b87eca 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -244,24 +244,19 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 				  struct nft_parse_err *err)
 {
 #ifdef XML_PARSING
-	struct nft_expr_byteorder *byteorder = nft_expr_data(e);
 	const char *op;
 	int32_t ntoh;
-	uint32_t reg;
+	uint32_t sreg, dreg, len, size;
 
-	if (nft_mxml_reg_parse(tree, "sreg", &reg, MXML_DESCEND_FIRST,
-			       NFT_XML_MAND, err) != 0)
+	if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
+			       NFT_XML_MAND, err) < 0)
 		return -1;
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg);
 
-	byteorder->sreg = reg;
-	e->flags |= (1 << NFT_EXPR_BYTEORDER_SREG);
-
-	if (nft_mxml_reg_parse(tree, "dreg", &reg, MXML_DESCEND, NFT_XML_MAND,
-			       err) != 0)
+	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFT_XML_MAND,
+			       err) < 0)
 		return -1;
-
-	byteorder->dreg = reg;
-	e->flags |= (1 << NFT_EXPR_BYTEORDER_DREG);
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg);
 
 	op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST, NFT_XML_MAND,
 				err);
@@ -271,23 +266,19 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 	ntoh = nft_str2ntoh(op);
 	if (ntoh < 0)
 		return -1;
-
-	byteorder->op = ntoh;
-	e->flags |= (1 << NFT_EXPR_BYTEORDER_OP);
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
 
 	if (nft_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST, BASE_DEC,
-			       &byteorder->len, NFT_TYPE_U8,
-			       NFT_XML_MAND, err) != 0)
+			       &len, NFT_TYPE_U32, NFT_XML_MAND,
+			       err) < 0)
 		return -1;
-
-	e->flags |= (1 << NFT_EXPR_BYTEORDER_LEN);
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, len);
 
 	if (nft_mxml_num_parse(tree, "size", MXML_DESCEND_FIRST, BASE_DEC,
-			       &byteorder->size, NFT_TYPE_U8,
-			       NFT_XML_MAND, err) != 0)
+			       &size, NFT_TYPE_U32, NFT_XML_MAND,
+			       err) != 0)
 		return -1;
-
-	e->flags |= (1 << NFT_EXPR_BYTEORDER_SIZE);
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size);
 
 	return 0;
 #else
-- 
2.0.0

[libnftnl PATCH 3/5] expr: byteorder: 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/byteorder.c | 71 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 0b87eca..ad7721f 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -249,36 +249,28 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 	uint32_t sreg, dreg, len, size;
 
 	if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
-			       NFT_XML_MAND, err) < 0)
-		return -1;
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg);
+			       NFT_XML_MAND, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg);
 
 	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFT_XML_MAND,
-			       err) < 0)
-		return -1;
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg);
+			       err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg);
 
 	op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST, NFT_XML_MAND,
 				err);
-	if (op == NULL)
-		return -1;
-
-	ntoh = nft_str2ntoh(op);
-	if (ntoh < 0)
-		return -1;
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
+	if (op != NULL) {
+		ntoh = nft_str2ntoh(op);
+		if (ntoh >= 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
+	}
 
 	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_BYTEORDER_LEN, len);
+			       &len, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, len);
 
 	if (nft_mxml_num_parse(tree, "size", MXML_DESCEND_FIRST, BASE_DEC,
-			       &size, NFT_TYPE_U32, NFT_XML_MAND,
-			       err) != 0)
-		return -1;
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size);
+			       &size, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size);
 
 	return 0;
 #else
@@ -312,15 +304,34 @@ static int nft_rule_expr_byteorder_snprintf_xml(char *buf, size_t size,
 	struct nft_expr_byteorder *byteorder = nft_expr_data(e);
 	int len = size, offset = 0, ret;
 
-	ret = snprintf(buf, len, "<sreg>%u</sreg>"
-				 "<dreg>%u</dreg>"
-				 "<op>%s</op>"
-				 "<len>%u</len>"
-				 "<size>%u</size>",
-		       byteorder->sreg, byteorder->dreg,
-		       expr_byteorder_str[byteorder->op],
-		       byteorder->len, byteorder->size);
-	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_SREG)) {
+		ret = snprintf(buf + offset, len, "<sreg>%u</sreg>",
+			       byteorder->sreg);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_DREG)) {
+		ret = snprintf(buf + offset, len, "<dreg>%u</dreg>",
+			       byteorder->dreg);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_OP)) {
+		ret = snprintf(buf + offset, len, "<op>%s</op>",
+			       expr_byteorder_str[byteorder->op]);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_LEN)) {
+		ret = snprintf(buf + offset, len, "<len>%u</len>",
+			       byteorder->len);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_SIZE)) {
+		ret = snprintf(buf + offset, len, "<size>%u</size>",
+			       byteorder->size);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
 
 	return offset;
 }
-- 
2.0.0

Re: [libnftnl PATCH 3/5] expr: byteorder: Do not print unset values in xml file

[Arturo Borrero Gonzalez]

On 19 June 2014 17:07, Ana Rey <anarey@gmail.com> wrote:
> It changes the parse and snprintf functions to omit unset values.
>
> Signed-off-by: Ana Rey <anarey@gmail.com>
> ---
>  src/expr/byteorder.c | 71 ++++++++++++++++++++++++++++++----------------------
>  1 file changed, 41 insertions(+), 30 deletions(-)
>
> diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
> index 0b87eca..ad7721f 100644
> --- a/src/expr/byteorder.c
> +++ b/src/expr/byteorder.c
> @@ -249,36 +249,28 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
>         uint32_t sreg, dreg, len, size;
>
>         if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
> -                              NFT_XML_MAND, err) < 0)
> -               return -1;
> -       nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg);
> +                              NFT_XML_MAND, err) == 0)
> +               nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg);
>
>         if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFT_XML_MAND,
> -                              err) < 0)
> -               return -1;
> -       nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg);
> +                              err) == 0)
> +               nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg);
>
>         op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST, NFT_XML_MAND,
>                                 err);
> -       if (op == NULL)
> -               return -1;
> -
> -       ntoh = nft_str2ntoh(op);
> -       if (ntoh < 0)
> -               return -1;
> -       nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
> +       if (op != NULL) {
> +               ntoh = nft_str2ntoh(op);
> +               if (ntoh >= 0)
> +                       nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
> +       }
>
>         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_BYTEORDER_LEN, len);
> +                              &len, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
> +               nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, len);
>
>         if (nft_mxml_num_parse(tree, "size", MXML_DESCEND_FIRST, BASE_DEC,
> -                              &size, NFT_TYPE_U32, NFT_XML_MAND,
> -                              err) != 0)
> -               return -1;
> -       nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size);
> +                              &size, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
> +               nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size);
>
>         return 0;
>  #else
> @@ -312,15 +304,34 @@ static int nft_rule_expr_byteorder_snprintf_xml(char *buf, size_t size,
>         struct nft_expr_byteorder *byteorder = nft_expr_data(e);
>         int len = size, offset = 0, ret;
>
> -       ret = snprintf(buf, len, "<sreg>%u</sreg>"
> -                                "<dreg>%u</dreg>"
> -                                "<op>%s</op>"
> -                                "<len>%u</len>"
> -                                "<size>%u</size>",
> -                      byteorder->sreg, byteorder->dreg,
> -                      expr_byteorder_str[byteorder->op],
> -                      byteorder->len, byteorder->size);
> -       SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
> +       if (e->flags & (1 << NFT_EXPR_BYTEORDER_SREG)) {
> +               ret = snprintf(buf + offset, len, "<sreg>%u</sreg>",
> +                              byteorder->sreg);
> +               SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
> +       }
> +
> +       if (e->flags & (1 << NFT_EXPR_BYTEORDER_DREG)) {
> +               ret = snprintf(buf + offset, len, "<dreg>%u</dreg>",
> +                              byteorder->dreg);
> +               SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
> +       }
> +
> +       if (e->flags & (1 << NFT_EXPR_BYTEORDER_OP)) {
> +               ret = snprintf(buf + offset, len, "<op>%s</op>",
> +                              expr_byteorder_str[byteorder->op]);
> +               SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
> +       }
> +
> +       if (e->flags & (1 << NFT_EXPR_BYTEORDER_LEN)) {
> +               ret = snprintf(buf + offset, len, "<len>%u</len>",
> +                              byteorder->len);
> +               SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
> +       }
> +       if (e->flags & (1 << NFT_EXPR_BYTEORDER_SIZE)) {
> +               ret = snprintf(buf + offset, len, "<size>%u</size>",
> +                              byteorder->size);
> +               SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
> +       }
>

This is an absolutely minor thing about the style: Why not being
consistent with the blank line separations between these if
statements?

A minor thing :-) I guess no need to resend.

-- 
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

[libnftnl PATCH 4/5] expr: byteorder: Rename variables in nft_rule_expr_byteorder_json_parse functions

[Ana Rey]

Renames some variables for code readability reasons.

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

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index ad7721f..e56af3f 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -199,18 +199,18 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root,
 {
 #ifdef JSON_PARSING
 	const char *op;
-	uint32_t uval32;
+	uint32_t sreg, dreg, len, size;
 	int ntoh;
 
-	if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &uval32, err) < 0)
+	if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &sreg, err) < 0)
 		return -1;
 
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, uval32);
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg);
 
-	if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &uval32, err) < 0)
+	if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &dreg, err) < 0)
 		return -1;
 
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, uval32);
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg);
 
 	op = nft_jansson_parse_str(root, "op", err);
 	if (op == NULL)
@@ -222,15 +222,15 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root,
 
 	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
 
-	if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32, err) < 0)
+	if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &len, err) < 0)
 		return -1;
 
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, uval32);
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, len);
 
-	if (nft_jansson_parse_val(root, "size", NFT_TYPE_U32, &uval32, err) < 0)
+	if (nft_jansson_parse_val(root, "size", NFT_TYPE_U32, &size, err) < 0)
 		return -1;
 
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, uval32);
+	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size);
 
 	return 0;
 #else
-- 
2.0.0

[libnftnl PATCH 5/5] expr: byteorder: Do not print unset values in json

[Ana Rey]

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

Now, This part of a json file is gotten without unset elements.

[FILE EXAMPLE]

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

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index e56af3f..20a89d3 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -202,35 +202,24 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root,
 	uint32_t sreg, dreg, len, size;
 	int ntoh;
 
-	if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &sreg, err) < 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg);
-
-	if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &dreg, err) < 0)
-		return -1;
+	if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &sreg, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg);
 
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg);
+	if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &dreg, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg);
 
 	op = nft_jansson_parse_str(root, "op", err);
-	if (op == NULL)
-		return -1;
-
-	ntoh = nft_str2ntoh(op);
-	if (ntoh < 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
-
-	if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &len, err) < 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, len);
+	if (op != NULL) {
+		ntoh = nft_str2ntoh(op);
+		if (ntoh >= 0)
+			nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
+	}
 
-	if (nft_jansson_parse_val(root, "size", NFT_TYPE_U32, &size, err) < 0)
-		return -1;
+	if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &len, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, len);
 
-	nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size);
+	if (nft_jansson_parse_val(root, "size", NFT_TYPE_U32, &size, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size);
 
 	return 0;
 #else
@@ -285,15 +274,37 @@ static int nft_rule_expr_byteorder_snprintf_json(char *buf, size_t size,
 	struct nft_expr_byteorder *byteorder = nft_expr_data(e);
 	int len = size, offset = 0, ret;
 
-	ret = snprintf(buf, len, "\"sreg\":%u,"
-				 "\"dreg\":%u,"
-				 "\"op\":\"%s\","
-				 "\"len\":%u,"
-				 "\"size\":%u",
-		       byteorder->sreg, byteorder->dreg,
-		       expr_byteorder_str[byteorder->op],
-		       byteorder->len, byteorder->size);
-	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_SREG)) {
+		ret = snprintf(buf + offset, len, "\"sreg\":%u,",
+			       byteorder->sreg);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_DREG)) {
+		ret = snprintf(buf + offset, len, "\"dreg\":%u,",
+			       byteorder->dreg);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_OP)) {
+		ret = snprintf(buf + offset, len, "\"op\":\"%s\",",
+			       expr_byteorder_str[byteorder->op]);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_LEN)) {
+		ret = snprintf(buf + offset, len, "\"len\":%u,",
+			       byteorder->len);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_BYTEORDER_SIZE)) {
+		ret = snprintf(buf + offset, len, "\"size\":%u,",
+			       byteorder->size);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (offset > 0)
+		offset--;
 
 	return offset;
 }
-- 
2.0.0

Re: [libnftnl PATCH 0/5] expr: bitwise: Do not print unset values

[Arturo Borrero Gonzalez]

On 19 June 2014 17:07, Ana Rey <anarey@gmail.com> wrote:
> This patchset does tasks about does not print unset value in xml and json file
> and about refactoring code:
>
> *"expr: byteorder: Get a nft_rule_expr type in
>     nft_rule_expr_byteorder_snprintf_* functions"
> * "expr: byteorder: Use nft_rule_expr_set_* in the xml parsing code"
> * "expr: byteorder: Rename variables in
>     nft_rule_expr_byteorder_json_parse functions"
>
> *** BLURB HERE ***
>
> Ana Rey (5):
>   expr: byteorder: Get a nft_rule_expr type in
>     nft_rule_expr_byteorder_snprintf_* functions
>   expr: byteorder: Use nft_rule_expr_set_* in the xml parsing code
>   expr: byteorder: Do not print unset values in xml file
>   expr: byteorder: Rename variables in
>     nft_rule_expr_byteorder_json_parse functions
>   expr: byteorder: Do not print unset values in json
>
>  src/expr/byteorder.c | 196 +++++++++++++++++++++++++++------------------------
>  1 file changed, 102 insertions(+), 94 deletions(-)
>

Hi Ana,

I reviewed this patch set, and is OK to me.

regards.
-- 
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