diff options
| author | Ana Rey <anarey@gmail.com> | 2014-06-24 19:15:03 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-24 19:19:02 +0200 |
| commit | 2544625cd98163439cab76c972f9442edd9b7fd9 (patch) | |
| tree | cb0a44db16fa1d42bcd84999cc0eac5ec5c674d6 | |
| parent | 0fdb474c270d4574a2da3eef6042151bd8512698 (diff) | |
expr: match: Do not print unset values in xml file
It changes the parse and snprintf functions to omit unset values.
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/expr/match.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/expr/match.c b/src/expr/match.c index 572d0f9..604a8e6 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -198,9 +198,8 @@ static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, mxml_node_t *t name = nft_mxml_str_parse(tree, "name", MXML_DESCEND_FIRST, NFT_XML_MAND, err); - if (name == NULL) - return -1; - nft_rule_expr_set_str(e, NFT_EXPR_MT_NAME, name); + if (name != NULL) + nft_rule_expr_set_str(e, NFT_EXPR_MT_NAME, name); /* mt->info is ignored until other solution is reached */ @@ -231,13 +230,14 @@ static int nft_rule_expr_match_snprintf_xml(char *buf, size_t len, int ret, size=len; int offset = 0; - ret = snprintf(buf, len, "<name>%s</name>", mt->name); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_EXPR_MT_NAME)) { + ret = snprintf(buf, len, "<name>%s</name>", mt->name); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } return offset; } - static int nft_rule_expr_match_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) |