* [libnftnl PATCH 0/3] expr: lookup: Do not print unset values in xml and json
@ 2014-06-24 17:14 Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 1/3] expr: lookup: Use nft_rule_expr_set_* in the xml parsing code Ana Rey
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ana Rey @ 2014-06-24 17:14 UTC (permalink / raw
To: netfilter-devel; +Cc: Ana Rey
This patchset does tasks about does not print unset values in xml and json file
and about refactoring code:
* "expr: lookup: Use nft_rule_expr_set_* in the xml parsing code"
Ana Rey (3):
expr: lookup: Use nft_rule_expr_set_* in the xml parsing code
expr: lookup: Do not print unset values in xml file
expr: lookup: Do not print unset values in json file
src/expr/lookup.c | 80 +++++++++++++++++++++++++------------------------------
1 file changed, 37 insertions(+), 43 deletions(-)
--
2.0.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [libnftnl PATCH 1/3] expr: lookup: Use nft_rule_expr_set_* in the xml parsing code
2014-06-24 17:14 [libnftnl PATCH 0/3] expr: lookup: Do not print unset values in xml and json Ana Rey
@ 2014-06-24 17:14 ` Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 2/3] expr: lookup: Do not print unset values in xml file Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 3/3] expr: lookup: Do not print unset values in json file Ana Rey
2 siblings, 0 replies; 4+ messages in thread
From: Ana Rey @ 2014-06-24 17:14 UTC (permalink / raw
To: netfilter-devel; +Cc: Ana Rey
Code refactoring to use nft_rule_expr_set_* in parse functions.
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/lookup.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 1df65db..68b7345 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -194,31 +194,23 @@ nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
struct nft_parse_err *err)
{
#ifdef XML_PARSING
- struct nft_expr_lookup *lookup = nft_expr_data(e);
const char *set_name;
- uint32_t reg;
+ uint32_t sreg, dreg;
set_name = nft_mxml_str_parse(tree, "set", MXML_DESCEND_FIRST,
NFT_XML_MAND, err);
if (set_name == NULL)
return -1;
+ nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name);
- strncpy(lookup->set_name, set_name, IFNAMSIZ);
- lookup->set_name[IFNAMSIZ-1] = '\0';
- e->flags |= (1 << NFT_EXPR_LOOKUP_SET);
-
- if (nft_mxml_reg_parse(tree, "sreg", ®, MXML_DESCEND,
+ if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND,
NFT_XML_MAND, err) != 0)
return -1;
+ nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, sreg);
- lookup->sreg = reg;
- e->flags |= (1 << NFT_EXPR_LOOKUP_SREG);
-
- if (nft_mxml_reg_parse(tree, "dreg", ®, MXML_DESCEND,
- NFT_XML_OPT, err) == 0) {
- lookup->dreg = reg;
- e->flags |= (1 << NFT_EXPR_LOOKUP_DREG);
- }
+ if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND,
+ NFT_XML_OPT, err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, dreg);
return 0;
#else
--
2.0.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [libnftnl PATCH 2/3] expr: lookup: Do not print unset values in xml file
2014-06-24 17:14 [libnftnl PATCH 0/3] expr: lookup: Do not print unset values in xml and json Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 1/3] expr: lookup: Use nft_rule_expr_set_* in the xml parsing code Ana Rey
@ 2014-06-24 17:14 ` Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 3/3] expr: lookup: Do not print unset values in json file Ana Rey
2 siblings, 0 replies; 4+ messages in thread
From: Ana Rey @ 2014-06-24 17:14 UTC (permalink / raw
To: netfilter-devel; +Cc: Ana Rey
It changes the parse functions to omit unset values.
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/lookup.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 68b7345..d0d81cb 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -199,17 +199,15 @@ nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
set_name = nft_mxml_str_parse(tree, "set", MXML_DESCEND_FIRST,
NFT_XML_MAND, err);
- if (set_name == NULL)
- return -1;
- nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name);
+ if (set_name != NULL)
+ nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name);
- if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND,
- NFT_XML_MAND, err) != 0)
- return -1;
- nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, sreg);
+ if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND, NFT_XML_MAND,
+ err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, sreg);
- if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND,
- NFT_XML_OPT, err) == 0)
+ if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFT_XML_OPT,
+ err) == 0)
nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, dreg);
return 0;
@@ -246,12 +244,16 @@ nft_rule_expr_lookup_snprintf_xml(char *buf, size_t size,
int len = size, offset = 0, ret;
struct nft_expr_lookup *l = nft_expr_data(e);
- ret = snprintf(buf, len, "<set>%s</set><sreg>%u</sreg>",
- l->set_name, l->sreg);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-
+ if (e->flags & (1 << NFT_EXPR_LOOKUP_SET)) {
+ ret = snprintf(buf, len, "<set>%s</set>", l->set_name);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
+ if (e->flags & (1 << NFT_EXPR_LOOKUP_SREG)) {
+ ret = snprintf(buf + offset, len, "<sreg>%u</sreg>", l->sreg);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
if (e->flags & (1 << NFT_EXPR_LOOKUP_DREG)) {
- ret = snprintf(buf+offset, len, "<dreg>%u</dreg>", l->dreg);
+ ret = snprintf(buf + offset, len, "<dreg>%u</dreg>", l->dreg);
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
}
--
2.0.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [libnftnl PATCH 3/3] expr: lookup: Do not print unset values in json file
2014-06-24 17:14 [libnftnl PATCH 0/3] expr: lookup: Do not print unset values in xml and json Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 1/3] expr: lookup: Use nft_rule_expr_set_* in the xml parsing code Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 2/3] expr: lookup: Do not print unset values in xml file Ana Rey
@ 2014-06-24 17:14 ` Ana Rey
2 siblings, 0 replies; 4+ messages in thread
From: Ana Rey @ 2014-06-24 17:14 UTC (permalink / raw
To: netfilter-devel; +Cc: Ana Rey
It changes the parse functions to omit unset values.
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/lookup.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index d0d81cb..3f77228 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -164,23 +164,17 @@ nft_rule_expr_lookup_json_parse(struct nft_rule_expr *e, json_t *root,
{
#ifdef JSON_PARSING
const char *set_name;
- int32_t reg;
+ uint32_t sreg, dreg;
set_name = nft_jansson_parse_str(root, "set", err);
- if (set_name == NULL)
- return -1;
-
- nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name);
-
- if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, ®, err) < 0)
- return -1;
-
- nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, reg);
+ if (set_name != NULL)
+ nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name);
- if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, ®, 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_LOOKUP_SREG, sreg);
- nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, reg);
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &dreg, err) == 0)
+ nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, dreg);
return 0;
#else
@@ -224,19 +218,25 @@ nft_rule_expr_lookup_snprintf_json(char *buf, size_t size,
int len = size, offset = 0, ret;
struct nft_expr_lookup *l = nft_expr_data(e);
- ret = snprintf(buf, len, "\"set\":\"%s\",\"sreg\":%u",
- l->set_name, l->sreg);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-
+ if (e->flags & (1 << NFT_EXPR_LOOKUP_SET)) {
+ ret = snprintf(buf, len, "\"set\":\"%s\",", l->set_name);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
+ if (e->flags & (1 << NFT_EXPR_LOOKUP_SREG)) {
+ ret = snprintf(buf + offset, len, "\"sreg\":%u,", l->sreg);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
if (e->flags & (1 << NFT_EXPR_LOOKUP_DREG)) {
- ret = snprintf(buf+offset, len, ",\"dreg\":%u", l->dreg);
+ ret = snprintf(buf + offset, len, "\"dreg\":%u,", l->dreg);
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
}
+ /* Remove the last comma characther */
+ if (offset > 0)
+ offset--;
return offset;
}
-
static int
nft_rule_expr_lookup_snprintf_xml(char *buf, size_t size,
struct nft_rule_expr *e)
--
2.0.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-24 17:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-24 17:14 [libnftnl PATCH 0/3] expr: lookup: Do not print unset values in xml and json Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 1/3] expr: lookup: Use nft_rule_expr_set_* in the xml parsing code Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 2/3] expr: lookup: Do not print unset values in xml file Ana Rey
2014-06-24 17:14 ` [libnftnl PATCH 3/3] expr: lookup: Do not print unset values in json file Ana Rey
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.