diff options
| author | Ana Rey <anarey@gmail.com> | 2014-06-23 11:38:19 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-23 19:48:37 +0200 |
| commit | fe61f81e54dc3647adfedc6659dd6617078c84f4 (patch) | |
| tree | b8c32c888ef346f9189414fcb8816ae63683abb3 /src | |
| parent | dccedc04051e246d6a553c35c280f2bf9e2e8fd1 (diff) | |
expr: target: 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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr/target.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/expr/target.c b/src/expr/target.c index 623d22c..101f3d0 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -199,10 +199,8 @@ nft_rule_expr_target_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, 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_TG_NAME, name); + if (name != NULL) + nft_rule_expr_set_str(e, NFT_EXPR_TG_NAME, name); /* tg->info is ignored until other solution is reached */ @@ -232,8 +230,10 @@ static int nft_rule_exp_target_snprintf_xml(char *buf, size_t len, int ret, size=len; int offset = 0; - ret = snprintf(buf, len, "<name>%s</name>", target->name); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_EXPR_TG_NAME)) { + ret = snprintf(buf, len, "<name>%s</name>", target->name); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } return offset; } |