From 3177a0d6f4be42775c128c02afe7de78dc3ea99d Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 15 Jan 2014 07:28:20 +0000 Subject: 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 --- src/expr/cmp.c | 4 ++-- src/expr/meta.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/expr/cmp.c b/src/expr/cmp.c index 246f22f..1c5787e 100644 --- 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 490d64a..74ecdb3 100644 --- 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 */ }; }; -- cgit v1.2.3