* [libnftnl PATCH 1/3] expr: bitwise: Get a nft_rule_expr type in nft_rule_expr_bitwise_snprintf_* functions
2014-06-19 10:05 [libnftnl PATCH 0/3] expr: bitwise: Do not print unset values Ana Rey
@ 2014-06-19 10:05 ` Ana Rey
2014-06-19 10:05 ` [libnftnl PATCH 2/3] expr: bitwise: Do not print unset values in xml Ana Rey
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ana Rey @ 2014-06-19 10:05 UTC (permalink / raw)
To: netfilter-devel; +Cc: Ana Rey
Code refactoring in nft_rule_expr_bitwise_snprintf_* functions to get a
nft_rule_expr type instead of nft_expr_bitwise type.
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/bitwise.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index c8fd0ec..148ee08 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -279,11 +279,11 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
#endif
}
-static int
-nft_rule_expr_bitwise_snprintf_json(char *buf, size_t size,
- struct nft_expr_bitwise *bitwise)
+static int nft_rule_expr_bitwise_snprintf_json(char *buf, size_t size,
+ struct nft_rule_expr *e)
{
int len = size, offset = 0, ret;
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
ret = snprintf(buf, len, "\"sreg\":%u,"
"\"dreg\":%u,"
@@ -311,10 +311,10 @@ nft_rule_expr_bitwise_snprintf_json(char *buf, size_t size,
return offset;
}
-static int
-nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size,
- struct nft_expr_bitwise *bitwise)
+static int nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size,
+ struct nft_rule_expr *e)
{
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
int len = size, offset = 0, ret;
ret = snprintf(buf, len, "<sreg>%u</sreg>"
@@ -343,10 +343,10 @@ nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size,
return offset;
}
-static int
-nft_rule_expr_bitwise_snprintf_default(char *buf, size_t size,
- struct nft_expr_bitwise *bitwise)
+static int nft_rule_expr_bitwise_snprintf_default(char *buf, size_t size,
+ struct nft_rule_expr *e)
{
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
int len = size, offset = 0, ret;
ret = snprintf(buf, len, "reg %u = (reg=%u & ",
@@ -371,16 +371,13 @@ static int
nft_rule_expr_bitwise_snprintf(char *buf, size_t size, uint32_t type,
uint32_t flags, struct nft_rule_expr *e)
{
- struct nft_expr_bitwise *bitwise = nft_expr_data(e);
-
switch(type) {
case NFT_OUTPUT_DEFAULT:
- return nft_rule_expr_bitwise_snprintf_default(buf, size,
- bitwise);
+ return nft_rule_expr_bitwise_snprintf_default(buf, size, e);
case NFT_OUTPUT_XML:
- return nft_rule_expr_bitwise_snprintf_xml(buf, size, bitwise);
+ return nft_rule_expr_bitwise_snprintf_xml(buf, size, e);
case NFT_OUTPUT_JSON:
- return nft_rule_expr_bitwise_snprintf_json(buf, size, bitwise);
+ return nft_rule_expr_bitwise_snprintf_json(buf, size, e);
default:
break;
}
--
2.0.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [libnftnl PATCH 2/3] expr: bitwise: Do not print unset values in xml
2014-06-19 10:05 [libnftnl PATCH 0/3] expr: bitwise: Do not print unset values Ana Rey
2014-06-19 10:05 ` [libnftnl PATCH 1/3] expr: bitwise: Get a nft_rule_expr type in nft_rule_expr_bitwise_snprintf_* functions Ana Rey
@ 2014-06-19 10:05 ` Ana Rey
2014-06-19 10:05 ` [libnftnl PATCH 3/3] expr: bitwise: Do not print unset values in json Ana Rey
2014-06-20 7:19 ` [libnftnl PATCH 0/3] expr: bitwise: Do not print unset values Arturo Borrero Gonzalez
3 siblings, 0 replies; 5+ messages in thread
From: Ana Rey @ 2014-06-19 10:05 UTC (permalink / raw)
To: netfilter-devel; +Cc: Ana Rey
It changes the parse and the snprint functions to omit unset values.
Now, This part of a xml file is gotten without unset elements.
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/bitwise.c | 95 ++++++++++++++++++++++++++++--------------------------
1 file changed, 49 insertions(+), 46 deletions(-)
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 148ee08..36a3111 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -231,40 +231,27 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
{
#ifdef XML_PARSING
struct nft_expr_bitwise *bitwise = nft_expr_data(e);
- uint32_t reg;
+ uint32_t sreg, dreg, len;
- if (nft_mxml_reg_parse(tree, "sreg", ®, MXML_DESCEND_FIRST,
- NFT_XML_MAND, err) != 0)
- return -1;
-
- bitwise->sreg = reg;
- e->flags |= (1 << NFT_EXPR_BITWISE_SREG);
-
- if (nft_mxml_reg_parse(tree, "dreg", ®, MXML_DESCEND_FIRST,
- NFT_XML_MAND, err) != 0)
- return -1;
-
- bitwise->dreg = reg;
- e->flags |= (1 << NFT_EXPR_BITWISE_DREG);
-
- if (nft_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST,
- BASE_DEC, &bitwise->len, NFT_TYPE_U8,
- NFT_XML_MAND, err) != 0)
- return -1;
+ if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
+ NFT_XML_MAND, err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_SREG, sreg);
- e->flags |= (1 << NFT_EXPR_BITWISE_LEN);
+ if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST,
+ NFT_XML_MAND, err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_DREG, dreg);
- if (nft_mxml_data_reg_parse(tree, "mask", &bitwise->mask,
- NFT_XML_MAND, err) != DATA_VALUE)
- return -1;
+ if (nft_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST, BASE_DEC,
+ &len, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_LEN, len);
- e->flags |= (1 << NFT_EXPR_BITWISE_MASK);
+ if (nft_mxml_data_reg_parse(tree, "mask", &bitwise->mask, NFT_XML_MAND,
+ err) == DATA_VALUE)
+ e->flags |= (1 << NFT_EXPR_BITWISE_MASK);
- if (nft_mxml_data_reg_parse(tree, "xor", &bitwise->xor,
- NFT_XML_MAND, err) != DATA_VALUE)
- return -1;
-
- e->flags |= (1 << NFT_EXPR_BITWISE_XOR);
+ if (nft_mxml_data_reg_parse(tree, "xor", &bitwise->xor, NFT_XML_MAND,
+ err) == DATA_VALUE)
+ e->flags |= (1 << NFT_EXPR_BITWISE_XOR);
/* Additional validation: mask and xor must use the same number of
* data registers.
@@ -317,28 +304,44 @@ static int nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size,
struct nft_expr_bitwise *bitwise = nft_expr_data(e);
int len = size, offset = 0, ret;
- ret = snprintf(buf, len, "<sreg>%u</sreg>"
- "<dreg>%u</dreg>"
- "<len>%u</len>",
- bitwise->sreg, bitwise->dreg, bitwise->len);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ if (e->flags & (1 << NFT_EXPR_BITWISE_SREG)) {
+ ret = snprintf(buf + offset, len, "<sreg>%u</sreg>",
+ bitwise->sreg);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
+ if (e->flags & (1 << NFT_EXPR_BITWISE_DREG)) {
+ ret = snprintf(buf + offset, len, "<dreg>%u</dreg>",
+ bitwise->dreg);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
+ if (e->flags & (1 << NFT_EXPR_BITWISE_LEN)) {
+ ret = snprintf(buf + offset, len, "<len>%u</len>",
+ bitwise->len);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
+ if (e->flags & (1 << NFT_EXPR_BITWISE_MASK)) {
+ ret = snprintf(buf + offset, len, "<mask>");
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- ret = snprintf(buf+offset, len, "<mask>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ ret = nft_data_reg_snprintf(buf + offset, len, &bitwise->mask,
+ NFT_OUTPUT_XML, 0, DATA_VALUE);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->mask,
- NFT_OUTPUT_XML, 0, DATA_VALUE);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ ret = snprintf(buf + offset, len, "</mask>");
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
- ret = snprintf(buf+offset, len, "</mask><xor>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ if (e->flags & (1 << NFT_EXPR_BITWISE_XOR)) {
+ ret = snprintf(buf + offset, len, "<xor>");
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->xor,
- NFT_OUTPUT_XML, 0, DATA_VALUE);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ ret = nft_data_reg_snprintf(buf + offset, len, &bitwise->xor,
+ NFT_OUTPUT_XML, 0, DATA_VALUE);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- ret = snprintf(buf+offset, len, "</xor>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ ret = snprintf(buf + offset, len, "</xor>");
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
return offset;
}
--
2.0.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [libnftnl PATCH 3/3] expr: bitwise: Do not print unset values in json
2014-06-19 10:05 [libnftnl PATCH 0/3] expr: bitwise: Do not print unset values Ana Rey
2014-06-19 10:05 ` [libnftnl PATCH 1/3] expr: bitwise: Get a nft_rule_expr type in nft_rule_expr_bitwise_snprintf_* functions Ana Rey
2014-06-19 10:05 ` [libnftnl PATCH 2/3] expr: bitwise: Do not print unset values in xml Ana Rey
@ 2014-06-19 10:05 ` Ana Rey
2014-06-20 7:19 ` [libnftnl PATCH 0/3] expr: bitwise: Do not print unset values Arturo Borrero Gonzalez
3 siblings, 0 replies; 5+ messages in thread
From: Ana Rey @ 2014-06-19 10:05 UTC (permalink / raw)
To: netfilter-devel; +Cc: Ana Rey
It changes the parse and the snprint functions to omit unset values.
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/bitwise.c | 90 +++++++++++++++++++++++++++++++-----------------------
1 file changed, 51 insertions(+), 39 deletions(-)
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 36a3111..529594b 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -188,32 +188,22 @@ nft_rule_expr_bitwise_json_parse(struct nft_rule_expr *e, json_t *root,
struct nft_expr_bitwise *bitwise = nft_expr_data(e);
uint32_t reg, len;
- if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, ®, err) < 0)
- return -1;
-
- nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_SREG, reg);
-
- if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, ®, err) < 0)
- return -1;
-
- nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_DREG, reg);
-
- if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &len, err) < 0)
- return -1;
-
- nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_LEN, len);
+ if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, ®, err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_SREG, reg);
- if (nft_jansson_data_reg_parse(root, "mask",
- &bitwise->mask, err) != DATA_VALUE)
- return -1;
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, ®, err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_DREG, reg);
- e->flags |= (1 << NFT_EXPR_BITWISE_MASK);
+ if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &len, err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_LEN, len);
- if (nft_jansson_data_reg_parse(root, "xor",
- &bitwise->xor, err) != DATA_VALUE)
- return -1;
+ if (nft_jansson_data_reg_parse(root, "mask", &bitwise->mask,
+ err) == DATA_VALUE)
+ e->flags |= (1 << NFT_EXPR_BITWISE_MASK);
- e->flags |= (1 << NFT_EXPR_BITWISE_XOR);
+ if (nft_jansson_data_reg_parse(root, "xor", &bitwise->xor,
+ err) == DATA_VALUE)
+ e->flags |= (1 << NFT_EXPR_BITWISE_XOR);
if (bitwise->mask.len != bitwise->xor.len)
return -1;
@@ -272,28 +262,50 @@ static int nft_rule_expr_bitwise_snprintf_json(char *buf, size_t size,
int len = size, offset = 0, ret;
struct nft_expr_bitwise *bitwise = nft_expr_data(e);
- ret = snprintf(buf, len, "\"sreg\":%u,"
- "\"dreg\":%u,"
- "\"len\":%u,",
- bitwise->sreg, bitwise->dreg, bitwise->len);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ if (e->flags & (1 << NFT_EXPR_BITWISE_SREG)) {
+ ret = snprintf(buf + offset, len, "\"sreg\":%u,",
+ bitwise->sreg);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
- ret = snprintf(buf+offset, len, "\"mask\":{");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ if (e->flags & (1 << NFT_EXPR_BITWISE_DREG)) {
+ ret = snprintf(buf + offset, len, "\"dreg\":%u,",
+ bitwise->dreg);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
+ if (e->flags & (1 << NFT_EXPR_BITWISE_LEN)) {
+ ret = snprintf(buf + offset, len, "\"len\":%u,",
+ bitwise->len);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
- ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->mask,
- NFT_OUTPUT_JSON, 0, DATA_VALUE);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ if (e->flags & (1 << NFT_EXPR_BITWISE_MASK)) {
+ ret = snprintf(buf + offset, len, "\"mask\":{");
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- ret = snprintf(buf+offset, len, "},\"xor\":{");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->mask,
+ NFT_OUTPUT_JSON, 0, DATA_VALUE);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->xor,
- NFT_OUTPUT_JSON, 0, DATA_VALUE);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ ret = snprintf(buf + offset, len, "},");
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- ret = snprintf(buf+offset, len, "}");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
+
+ if (e->flags & (1 << NFT_EXPR_BITWISE_XOR)) {
+ ret = snprintf(buf+offset, len, "\"xor\":{");
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+
+ ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->xor,
+ NFT_OUTPUT_JSON, 0, DATA_VALUE);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+
+ ret = snprintf(buf+offset, len, "},");
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
+
+ if (offset > 0)
+ offset--;
return offset;
}
--
2.0.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [libnftnl PATCH 0/3] expr: bitwise: Do not print unset values
2014-06-19 10:05 [libnftnl PATCH 0/3] expr: bitwise: Do not print unset values Ana Rey
` (2 preceding siblings ...)
2014-06-19 10:05 ` [libnftnl PATCH 3/3] expr: bitwise: Do not print unset values in json Ana Rey
@ 2014-06-20 7:19 ` Arturo Borrero Gonzalez
3 siblings, 0 replies; 5+ messages in thread
From: Arturo Borrero Gonzalez @ 2014-06-20 7:19 UTC (permalink / raw)
To: Ana Rey; +Cc: Netfilter Development Mailing list
On 19 June 2014 12:05, 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: "Get a nft_rule_expr type in
> nft_rule_expr_bitwise_snprintf_* functions"
>
> Ana Rey (3):
> expr: bitwise: Get a nft_rule_expr type in
> nft_rule_expr_bitwise_snprintf_* functions
> expr: bitwise: Do not print unset values in xml
> expr: bitwise: Do not print unset values in json
>
> src/expr/bitwise.c | 212 ++++++++++++++++++++++++++++-------------------------
> 1 file changed, 112 insertions(+), 100 deletions(-)
>
Patch set reviewed. 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
^ permalink raw reply [flat|nested] 5+ messages in thread