summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAna Rey <anarey@gmail.com>2014-06-04 13:38:08 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2014-06-05 15:23:01 +0200
commitca4b919937684d8367842b1ec757bf9948a2c8c6 (patch)
treea06da64238fc8aa950717e58ad23fdaa45ebc418 /src
parent2c9840880d2d1f4f58b950047bd3763b43375a31 (diff)
expr: reject: Use nft_rule_expr_set_* in the xml
Code refactoring to use nft_rule_expr_set_* in parse functions. Signed-off-by: Ana Rey <anarey@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/expr/reject.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/expr/reject.c b/src/expr/reject.c
index aef1fd1..35aa964 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -151,21 +151,18 @@ nft_rule_expr_reject_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
struct nft_parse_err *err)
{
#ifdef XML_PARSING
- struct nft_expr_reject *reject = nft_expr_data(e);
+ uint32_t type;
+ uint8_t code;
if (nft_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
- &reject->type, NFT_TYPE_U32, NFT_XML_MAND,
- err) != 0)
+ &type, NFT_TYPE_U32, NFT_XML_MAND, err) < 0)
return -1;
-
- e->flags |= (1 << NFT_EXPR_REJECT_TYPE);
+ nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
if (nft_mxml_num_parse(tree, "code", MXML_DESCEND_FIRST, BASE_DEC,
- &reject->icmp_code, NFT_TYPE_U8, NFT_XML_MAND,
- err) != 0)
+ &code, NFT_TYPE_U8, NFT_XML_MAND, err) < 0)
return -1;
-
- e->flags |= (1 << NFT_EXPR_REJECT_CODE);
+ nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
return 0;
#else