expr/cmp: fix type size

Since nftables now uses nft_rule_expr_get_u32(), the internal size must
also be a uint32_t.

Fixes complete breakage of any cmp or meta expression.

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 246f22fac0d42f358ebd1e603d3b040f8b43948e..1c5787eba72fb5d4975b372004e4974e06b50e0e 100644 (file)
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -26,8 +26,8 @@
 
 struct nft_expr_cmp {
        union nft_data_reg      data;
-       uint8_t                 sreg;   /* enum nft_registers */
-       uint8_t                 op;     /* enum nft_cmp_ops */
+       uint32_t                sreg;   /* enum nft_registers */
+       uint32_t                op;     /* enum nft_cmp_ops */
 };
 
 static int

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 490d64af274e05d7504cb1ca1d8391ec1ac43fc0..74ecdb3d42921b4d5cf5685295b0b3875825210d 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -27,10 +27,10 @@
 #endif
 
 struct nft_expr_meta {
-       uint8_t                 key;    /* enum nft_meta_keys */
+       uint32_t                key;    /* enum nft_meta_keys */
        union {
-               uint8_t         dreg;   /* enum nft_registers */
-               uint8_t         sreg;   /* enum nft_registers */
+               uint32_t        dreg;   /* enum nft_registers */
+               uint32_t        sreg;   /* enum nft_registers */
        };
 };