From 2544625cd98163439cab76c972f9442edd9b7fd9 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Tue, 24 Jun 2014 19:15:03 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso --- src/expr/match.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') 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, "%s", mt->name); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_EXPR_MT_NAME)) { + ret = snprintf(buf, len, "%s", 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) -- cgit v1.2.3