expr: fix incorrect data type for several expression object fields

This patch fixes the incorrect data type (from uint8_t to uint32_t) in
several private data area of the expressions.

It also cleans up this by translating several unsigned int to uint32_t.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index ca1503c72cba24048440678bcf6ee9a794bb465d..b5c694a4dea32eea651dab8dce6d217baaed3914 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 */
+       enum nft_registers      sreg;
+       enum nft_cmp_ops        op;
 };
 
 static int

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 59d05a58d27aeee752aa2fb1a95eab8e6a345478..7e20464a7bfe4a2bdedd783de807b200070991aa 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -24,7 +24,7 @@
 
 struct nft_expr_ct {
        enum nft_ct_keys        key;
-       uint32_t                dreg;   /* enum nft_registers */
+       enum nft_registers      dreg;
        uint8_t                 dir;
 };
 

diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 813830bd3691b55916be54bbbfc9c256ca64e015..d9e293af8c22e3a45030a10636b680e0293554a3 100644 (file)
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -32,9 +32,9 @@
 
 struct nft_expr_exthdr {
        enum nft_registers      dreg;
+       uint32_t                offset;
+       uint32_t                len;
        uint8_t                 type;
-       unsigned int            offset;
-       unsigned int            len;
 };
 
 static int
@@ -51,10 +51,10 @@ nft_rule_expr_exthdr_set(struct nft_rule_expr *e, uint16_t type,
                exthdr->type = *((uint8_t *)data);
                break;
        case NFT_EXPR_EXTHDR_OFFSET:
-               exthdr->offset = *((unsigned int *)data);
+               exthdr->offset = *((uint32_t *)data);
                break;
        case NFT_EXPR_EXTHDR_LEN:
-               exthdr->len = *((unsigned int *)data);
+               exthdr->len = *((uint32_t *)data);
                break;
        default:
                return -1;

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 3c5fd77575c334b2b397402ae7de840ac70e861f..fb62bfdc283dea82918a2ee6dc62ee4066a7ccae 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -27,8 +27,8 @@
 #endif
 
 struct nft_expr_meta {
-       uint8_t                 key;    /* enum nft_meta_keys */
-       uint8_t                 dreg;   /* enum nft_registers */
+       enum nft_meta_keys      key;
+       enum nft_registers      dreg;
 };
 
 static int

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 911bb01be97d0847891c6137712f63d349fda483..2c1ef04845e9b3a5f7d12af1ddc2ee0658429b15 100644 (file)
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -29,8 +29,8 @@
 struct nft_expr_payload {
        enum nft_registers      dreg;
        enum nft_payload_bases  base;
-       unsigned int            offset;
-       unsigned int            len;
+       uint32_t                offset;
+       uint32_t                len;
 };
 
 static int