[libnftnl PATCH 0/5] reject: Do not print unset value

[libnftnl PATCH 0/5] reject: Do not print unset value

[Ana Rey]

With this patchset It does not print unset value in xml and json file.

Also, I do some tasks about refactoring code: Use of
nft_rule_expr_reject_snprinf_* functions, add nft_rule_expr_reject_snprinf_*
function and convert incorrect type of a variable.

Ana Rey (5):
  expr: reject: Add nft_rule_expr_reject_snprinf_* functions
  expr: reject: Use nft_rule_expr_set_* in the xml and default parsing
    code
  expr: reject: Do not print unset values in xml
  expr: reject: Convert the type of a variable
  expr: reject: Do not print unset values in json

 src/expr/reject.c | 108 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 73 insertions(+), 35 deletions(-)

-- 
2.0.0.rc2

[libnftnl PATCH 1/5] expr: reject: Add nft_rule_expr_reject_snprinf_* functions

[Ana Rey]

Code refactoring in nft_rule_expr_reject_snprinf functions. This process
adds three new functions:

* nft_rule_expr_reject_snprinf_default
* nft_rule_expr_reject_snprinf_xml
* nft_rule_expr_reject_snprinf_json

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

diff --git a/src/expr/reject.c b/src/expr/reject.c
index 62346e9..cefaf98 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -174,24 +174,46 @@ nft_rule_expr_reject_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 #endif
 }
 
+static int nft_rule_expr_reject_snprintf_default(char *buf, size_t len,
+						 struct nft_rule_expr *e)
+{
+	struct nft_expr_reject *reject = nft_expr_data(e);
+
+	return snprintf(buf, len, "type %u code %u  ",
+			reject->type, reject->icmp_code);
+}
+
+static int nft_rule_expr_reject_snprintf_xml(char *buf, size_t len,
+					     struct nft_rule_expr *e)
+{
+	struct nft_expr_reject *reject = nft_expr_data(e);
+
+	return snprintf(buf, len, "<type>%u</type>"
+				  "<code>%u</code>",
+			reject->type, reject->icmp_code);
+}
+
+static int nft_rule_expr_reject_snprintf_json(char *buf, size_t len,
+					      struct nft_rule_expr *e)
+{
+	struct nft_expr_reject *reject = nft_expr_data(e);
+
+	return snprintf(buf, len, "\"type\":%u,"
+				  "\"code\":%u,",
+			reject->type, reject->icmp_code);
+}
+
 static int
 nft_rule_expr_reject_snprintf(char *buf, size_t len, uint32_t type,
 			      uint32_t flags, struct nft_rule_expr *e)
 {
-	struct nft_expr_reject *reject = nft_expr_data(e);
-
 	switch(type) {
 	case NFT_OUTPUT_DEFAULT:
-		return snprintf(buf, len, "type %u code %u  ",
-				reject->type, reject->icmp_code);
+		return nft_rule_expr_reject_snprintf_default(buf, len, e);
 	case NFT_OUTPUT_XML:
-		return snprintf(buf, len, "<type>%u</type>"
-					  "<code>%u</code>",
-				reject->type, reject->icmp_code);
+		return nft_rule_expr_reject_snprintf_xml(buf, len, e);
 	case NFT_OUTPUT_JSON:
-		return snprintf(buf, len, "\"type\":%u,"
-					  "\"code\":%u,",
-				reject->type, reject->icmp_code);
+		return nft_rule_expr_reject_snprintf_json(buf, len, e);
 	default:
 		break;
 	}
-- 
2.0.0.rc2

[libnftnl PATCH 2/5] expr: reject: Use nft_rule_expr_set_* in the xml and default 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/reject.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/expr/reject.c b/src/expr/reject.c
index cefaf98..4db3461 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -103,19 +103,20 @@ nft_rule_expr_reject_build(struct nlmsghdr *nlh, struct nft_rule_expr *e)
 static int
 nft_rule_expr_reject_parse(struct nft_rule_expr *e, struct nlattr *attr)
 {
-	struct nft_expr_reject *reject = nft_expr_data(e);
 	struct nlattr *tb[NFTA_REJECT_MAX+1] = {};
+	uint32_t type;
+	uint8_t code;
 
 	if (mnl_attr_parse_nested(attr, nft_rule_expr_reject_cb, tb) < 0)
 		return -1;
 
 	if (tb[NFTA_REJECT_TYPE]) {
-		reject->type = ntohl(mnl_attr_get_u32(tb[NFTA_REJECT_TYPE]));
-		e->flags |= (1 << NFT_EXPR_REJECT_TYPE);
+		type = ntohl(mnl_attr_get_u32(tb[NFTA_REJECT_TYPE]));
+		nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
 	}
 	if (tb[NFTA_REJECT_ICMP_CODE]) {
-		reject->icmp_code = mnl_attr_get_u8(tb[NFTA_REJECT_ICMP_CODE]);
-		e->flags |= (1 << NFT_EXPR_REJECT_CODE);
+		code = mnl_attr_get_u8(tb[NFTA_REJECT_ICMP_CODE]);
+		nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
 	}
 
 	return 0;
@@ -151,21 +152,19 @@ nft_rule_expr_reject_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 			       struct nft_parse_err *err)
 {
 #ifdef XML_PARSING
-	struct nft_expr_reject *reject = nft_expr_data(e);
+
+	uint32_t type;
+	uint8_t code;
 
 	if (nft_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
-			       &reject->type, NFT_TYPE_U32, NFT_XML_MAND,
-			       err) != 0)
+			       &type, NFT_TYPE_U32, NFT_XML_MAND, err) < 0)
 		return -1;
-
-	e->flags |= (1 << NFT_EXPR_REJECT_TYPE);
+	nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
 
 	if (nft_mxml_num_parse(tree, "code", MXML_DESCEND_FIRST, BASE_DEC,
-			       &reject->icmp_code, NFT_TYPE_U8, NFT_XML_MAND,
-			       err) != 0)
+			       &code, NFT_TYPE_U8, NFT_XML_MAND, err) < 0)
 		return -1;
-
-	e->flags |= (1 << NFT_EXPR_REJECT_CODE);
+	nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
 
 	return 0;
 #else
-- 
2.0.0.rc2

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

[Ana Rey]

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

If we used this rule:
nft add rule ip test output reject

It gets this xml file:
[...]
<expr type="reject">
	<type>0</type>
	<code>0</code>
</expr>
</rule></nftables>

Now, That rule creates this xml file without null values:

[...]
<expr type="reject">
</expr>
</rule></nftables>

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

diff --git a/src/expr/reject.c b/src/expr/reject.c
index 4db3461..5aa555a 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -157,14 +157,12 @@ nft_rule_expr_reject_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 	uint8_t code;
 
 	if (nft_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
-			       &type, NFT_TYPE_U32, NFT_XML_MAND, err) < 0)
-		return -1;
-	nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
+			       &type, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
 
 	if (nft_mxml_num_parse(tree, "code", MXML_DESCEND_FIRST, BASE_DEC,
-			       &code, NFT_TYPE_U8, NFT_XML_MAND, err) < 0)
-		return -1;
-	nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
+			       &code, NFT_TYPE_U8, NFT_XML_MAND, err) == 0)
+		nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
 
 	return 0;
 #else
@@ -185,11 +183,21 @@ static int nft_rule_expr_reject_snprintf_default(char *buf, size_t len,
 static int nft_rule_expr_reject_snprintf_xml(char *buf, size_t len,
 					     struct nft_rule_expr *e)
 {
+	int ret, size = len, offset = 0;
 	struct nft_expr_reject *reject = nft_expr_data(e);
 
-	return snprintf(buf, len, "<type>%u</type>"
-				  "<code>%u</code>",
-			reject->type, reject->icmp_code);
+	if (e->flags & (1 << NFT_EXPR_REJECT_TYPE)) {
+		ret = snprintf(buf+offset, len, "<type>%u</type>",
+			       reject->type);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_REJECT_CODE)) {
+		ret = snprintf(buf+offset, len, "<code>%u</code>",
+			       reject->icmp_code);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	return offset;
 }
 
 static int nft_rule_expr_reject_snprintf_json(char *buf, size_t len,
-- 
2.0.0.rc2

[libnftnl PATCH 4/5] expr: reject: Convert the type of a variable

[Ana Rey]

Convert the type of a variable from uint16_t to uint8_t.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/reject.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/expr/reject.c b/src/expr/reject.c
index 5aa555a..8fc99af 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -128,7 +128,7 @@ nft_rule_expr_reject_json_parse(struct nft_rule_expr *e, json_t *root,
 {
 #ifdef JSON_PARSING
 	uint32_t type;
-	uint16_t code;
+	uint8_t code;
 
 	if (nft_jansson_parse_val(root, "type", NFT_TYPE_U32, &type, err) < 0)
 		return -1;
-- 
2.0.0.rc2

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

[Ana Rey]

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

If It uses this rule:
nft add rule ip test output input

It gets this json file:
[...] "expr":[{"type":"reject","type":0,"code":0}]}

Now, That rule creates this json file without null values:
[...] "expr":[{"type":"reject"}]}

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

diff --git a/src/expr/reject.c b/src/expr/reject.c
index 8fc99af..39de634 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -130,15 +130,11 @@ nft_rule_expr_reject_json_parse(struct nft_rule_expr *e, json_t *root,
 	uint32_t type;
 	uint8_t code;
 
-	if (nft_jansson_parse_val(root, "type", NFT_TYPE_U32, &type, err) < 0)
-		return -1;
-
-	nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
-
-	if (nft_jansson_parse_val(root, "code", NFT_TYPE_U8, &code, err) < 0)
-		return -1;
+	if (nft_jansson_parse_val(root, "type", NFT_TYPE_U32, &type, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
 
-	nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
+	if (nft_jansson_parse_val(root, "code", NFT_TYPE_U8, &code, err) == 0)
+		nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
 
 	return 0;
 #else
@@ -203,11 +199,24 @@ static int nft_rule_expr_reject_snprintf_xml(char *buf, size_t len,
 static int nft_rule_expr_reject_snprintf_json(char *buf, size_t len,
 					      struct nft_rule_expr *e)
 {
+	int ret, size = len, offset = 0;
 	struct nft_expr_reject *reject = nft_expr_data(e);
 
-	return snprintf(buf, len, "\"type\":%u,"
-				  "\"code\":%u,",
-			reject->type, reject->icmp_code);
+	if (e->flags & (1 << NFT_EXPR_REJECT_TYPE)) {
+		ret = snprintf(buf+offset, len, "\"type\":%u,",
+			       reject->type);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_REJECT_CODE)) {
+		ret = snprintf(buf+offset, len, "\"code\":%u,",
+			       reject->icmp_code);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (offset > 0) {
+		return offset-1;
+	}
+	return offset;
 }
 
 static int
-- 
2.0.0.rc2

Re: [libnftnl PATCH 1/5] expr: reject: Add nft_rule_expr_reject_snprinf_* functions

[Pablo Neira Ayuso]

On Wed, Jun 04, 2014 at 01:38:07PM +0200, Ana Rey wrote:
> Code refactoring in nft_rule_expr_reject_snprinf functions. This process
> adds three new functions:
> 
> * nft_rule_expr_reject_snprinf_default
> * nft_rule_expr_reject_snprinf_xml
> * nft_rule_expr_reject_snprinf_json

Applied with minor changes.

> Signed-off-by: Ana Rey <anarey@gmail.com>
> ---
>  src/expr/reject.c | 42 ++++++++++++++++++++++++++++++++----------
>  1 file changed, 32 insertions(+), 10 deletions(-)
> 
> diff --git a/src/expr/reject.c b/src/expr/reject.c
> index 62346e9..cefaf98 100644
> --- a/src/expr/reject.c
> +++ b/src/expr/reject.c
> @@ -174,24 +174,46 @@ nft_rule_expr_reject_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
>  #endif
>  }
>  
> +static int nft_rule_expr_reject_snprintf_default(char *buf, size_t len,
> +						 struct nft_rule_expr *e)
> +{
> +	struct nft_expr_reject *reject = nft_expr_data(e);
> +
> +	return snprintf(buf, len, "type %u code %u  ",
                                                   ^
removed extra whitespace. Not your fault, but good to fix it now that
we're just passing by this code.

Re: [libnftnl PATCH 2/5] expr: reject: Use nft_rule_expr_set_* in the xml and default parsing code

[Pablo Neira Ayuso]

On Wed, Jun 04, 2014 at 01:38:08PM +0200, Ana Rey wrote:
> Code refactoring to use nft_rule_expr_set_* in parse functions.

Applied the XML chunk.

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

[Pablo Neira Ayuso]

On Wed, Jun 04, 2014 at 01:38:09PM +0200, Ana Rey wrote:
> It changes the parse and the snprint functions to omit unset values.
> 
> If we used this rule:
> nft add rule ip test output reject
> 
> It gets this xml file:
> [...]
> <expr type="reject">
> 	<type>0</type>
> 	<code>0</code>
> </expr>
> </rule></nftables>
> 
> Now, That rule creates this xml file without null values:
> 
> [...]
> <expr type="reject">
> </expr>
> </rule></nftables>

Applied, thanks.

Re: [libnftnl PATCH 4/5] expr: reject: Convert the type of a variable

[Pablo Neira Ayuso]

On Wed, Jun 04, 2014 at 01:38:10PM +0200, Ana Rey wrote:
> Convert the type of a variable from uint16_t to uint8_t.

Applied, thanks.

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

[Pablo Neira Ayuso]

On Wed, Jun 04, 2014 at 01:38:11PM +0200, Ana Rey wrote:
> It changes the parse and the snprint functions to omit unset values.
> 
> If It uses this rule:
> nft add rule ip test output input
> 
> It gets this json file:
> [...] "expr":[{"type":"reject","type":0,"code":0}]}
> 
> Now, That rule creates this json file without null values:
> [...] "expr":[{"type":"reject"}]}

Applied, thanks.