diff options
| author | Ana Rey <anarey@gmail.com> | 2014-06-13 11:31:50 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 12:10:56 +0200 |
| commit | badd78599fdbb099f590496cadf3fdaf651a9508 (patch) | |
| tree | b9941444a461361e4ddad2d07b508780e8be19b4 /src | |
| parent | 77cfa2ed408f1dcdcec4b68393404eb0d161be27 (diff) | |
expr: queue: Use nft_rule_expr_* in the xml
Code refactoring to use nft_rule_expr_* in parse xml functions.
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/queue.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/expr/queue.c b/src/expr/queue.c index 5dad84a..1d47d48 100644 --- a/src/expr/queue.c +++ b/src/expr/queue.c @@ -164,28 +164,25 @@ nft_rule_expr_queue_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, struct nft_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_queue *queue = nft_expr_data(e); + uint16_t queue_num, queue_total, flags; if (nft_mxml_num_parse(tree, "num", MXML_DESCEND_FIRST, BASE_DEC, - &queue->queuenum, NFT_TYPE_U16, NFT_XML_MAND, + &queue_num, NFT_TYPE_U16, NFT_XML_MAND, err) != 0) return -1; - - e->flags |= (1 << NFT_EXPR_QUEUE_NUM); + nft_rule_expr_set_u16(e, NFT_EXPR_QUEUE_NUM, queue_num); if (nft_mxml_num_parse(tree, "total", MXML_DESCEND_FIRST, BASE_DEC, - &queue->queues_total, NFT_TYPE_U8, + &queue_total, NFT_TYPE_U8, NFT_XML_MAND, err) != 0) return -1; - - e->flags |= (1 << NFT_EXPR_QUEUE_TOTAL); + nft_rule_expr_set_u16(e, NFT_EXPR_QUEUE_TOTAL, queue_total); if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC, - &queue->flags, NFT_TYPE_U8, + &flags, NFT_TYPE_U8, NFT_XML_MAND, err) != 0) return -1; - - e->flags |= (1 << NFT_EXPR_QUEUE_FLAGS); + nft_rule_expr_set_u16(e, NFT_EXPR_QUEUE_FLAGS, flags); return 0; #else |