From 2a725335fca2d3d2cbb13f93119a8f4c0194b16e Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Tue, 24 Jun 2014 08:46:38 +0200 Subject: expr: ct: 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/ct.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/expr/ct.c b/src/expr/ct.c index 0f1c050..2c28beb 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -292,24 +292,22 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree uint32_t dreg, sreg; if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST, - NFT_XML_OPT, err) >= 0) + NFT_XML_OPT, err) == 0) nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, dreg); if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST, - NFT_XML_OPT, err) >= 0) + NFT_XML_OPT, err) == 0) nft_rule_expr_set_u32(e, NFT_EXPR_CT_SREG, sreg); key_str = nft_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST, NFT_XML_MAND, err); - if (key_str == NULL) - return -1; - - key = str2ctkey(key_str); - if (key < 0) - goto err; - - nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key); + if (key_str != NULL) { + key = str2ctkey(key_str); + if (key < 0) + return -1; + nft_rule_expr_set_u32(e, NFT_EXPR_CT_KEY, key); + } dir_str = nft_mxml_str_parse(tree, "dir", MXML_DESCEND_FIRST, NFT_XML_OPT, err); if (dir_str != NULL) { @@ -318,7 +316,6 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree err->error = NFT_PARSE_EBADTYPE; goto err; } - nft_rule_expr_set_u8(e, NFT_EXPR_CT_DIR, dir); } @@ -373,23 +370,20 @@ nft_expr_ct_snprintf_xml(char *buf, size_t size, struct nft_rule_expr *e) struct nft_expr_ct *ct = nft_expr_data(e); if (e->flags & (1 << NFT_EXPR_CT_DREG)) { - ret = snprintf(buf+offset, len, "%u", ct->dreg); + ret = snprintf(buf + offset, len, "%u", ct->dreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - if (e->flags & (1 << NFT_EXPR_CT_SREG)) { - ret = snprintf(buf+offset, len, "%u", ct->sreg); + ret = snprintf(buf + offset, len, "%u", ct->sreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - if (e->flags & (1 << NFT_EXPR_CT_KEY)) { - ret = snprintf(buf+offset, len, "%s", + ret = snprintf(buf + offset, len, "%s", ctkey2str(ct->key)); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - if (nft_rule_expr_is_set(e, NFT_EXPR_CT_DIR)) { - ret = snprintf(buf+offset, len, "%s", + ret = snprintf(buf + offset, len, "%s", ctdir2str(ct->dir)); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } -- cgit v1.2.3