diff options
Diffstat (limited to 'src/expr/meta.c')
| -rw-r--r-- | src/expr/meta.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/expr/meta.c b/src/expr/meta.c index aff5232..f9c9498 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -230,20 +230,18 @@ static int nft_rule_expr_meta_xml_parse(struct nft_rule_expr *e, mxml_node_t *tr key_str = nft_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST, NFT_XML_MAND, err); - if (key_str == NULL) - return -1; - - key = str2meta_key(key_str); - if (key < 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_META_KEY, key); + if (key_str != NULL) { + key = str2meta_key(key_str); + if (key >= 0) + nft_rule_expr_set_u32(e, NFT_EXPR_META_KEY, key); + } 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_META_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_META_SREG, sreg); return 0; @@ -278,19 +276,16 @@ nft_rule_expr_meta_snprintf_xml(char *buf, size_t size, struct nft_expr_meta *meta = nft_expr_data(e); if (e->flags & (1 << NFT_EXPR_META_DREG)) { - ret = snprintf(buf+offset, len, "<dreg>%u</dreg>", - meta->dreg); + ret = snprintf(buf, len, "<dreg>%u</dreg>", meta->dreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - if (e->flags & (1 << NFT_EXPR_META_KEY)) { - ret = snprintf(buf+offset, len, "<key>%s</key>", - meta_key2str(meta->key)); + ret = snprintf(buf + offset, len, "<key>%s</key>", + meta_key2str(meta->key)); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - if (e->flags & (1 << NFT_EXPR_META_SREG)) { - ret = snprintf(buf+offset, len, "<sreg>%u</sreg>", + ret = snprintf(buf + offset, len, "<sreg>%u</sreg>", meta->sreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } |