expr: queue: Use the correct data type

Fix wrong data types, eg. queue num is u16.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/queue.c b/src/expr/queue.c
index 55d2ab034a6d0ecdf4dec26baf8120b7ee61a8d4..78540b661411d050801e2dd5fdfbd880448e4036 100644 (file)
--- a/src/expr/queue.c
+++ b/src/expr/queue.c
@@ -134,11 +134,12 @@ nft_rule_expr_queue_json_parse(struct nft_rule_expr *e, json_t *root,
                               struct nft_parse_err *err)
 {
 #ifdef JSON_PARSING
-       uint32_t type;
+       uint16_t type;
        uint16_t code;
 
        if (nft_jansson_parse_val(root, "num", NFT_TYPE_U16, &type, err) == 0)
-               nft_rule_expr_set_u32(e, NFT_EXPR_QUEUE_NUM, type);
+               nft_rule_expr_set_u16(e, NFT_EXPR_QUEUE_NUM, type);
+       nft_rule_expr_set_u16(e, NFT_EXPR_QUEUE_NUM, type);
 
        if (nft_jansson_parse_val(root, "total", NFT_TYPE_U16, &code, err) == 0)
                nft_rule_expr_set_u16(e, NFT_EXPR_QUEUE_TOTAL, code);
@@ -166,12 +167,12 @@ nft_rule_expr_queue_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
                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_total, NFT_TYPE_U8,
+                              &queue_total, NFT_TYPE_U16,
                               NFT_XML_MAND, err) == 0)
                nft_rule_expr_set_u16(e, NFT_EXPR_QUEUE_TOTAL, queue_total);
 
        if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC,
-                              &flags, NFT_TYPE_U8,
+                              &flags, NFT_TYPE_U16,
                               NFT_XML_MAND, err) == 0)
                nft_rule_expr_set_u16(e, NFT_EXPR_QUEUE_FLAGS, flags);