diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/chain.c | 8 | ||||
-rw-r--r-- | src/rule.c | 8 | ||||
-rw-r--r-- | src/table.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/chain.c b/src/chain.c index a704502..33540b1 100644 --- a/src/chain.c +++ b/src/chain.c @@ -34,7 +34,7 @@ struct nft_chain { char name[NFT_CHAIN_MAXNAMELEN]; const char *type; const char *table; - uint8_t family; + uint32_t family; uint32_t policy; uint32_t hooknum; int32_t prio; @@ -147,7 +147,7 @@ static uint32_t nft_chain_attr_validate[NFT_CHAIN_ATTR_MAX + 1] = { [NFT_CHAIN_ATTR_BYTES] = sizeof(uint64_t), [NFT_CHAIN_ATTR_PACKETS] = sizeof(uint64_t), [NFT_CHAIN_ATTR_HANDLE] = sizeof(uint64_t), - [NFT_CHAIN_ATTR_FAMILY] = sizeof(uint8_t), + [NFT_CHAIN_ATTR_FAMILY] = sizeof(uint32_t), }; void nft_chain_attr_set_data(struct nft_chain *c, uint16_t attr, @@ -190,7 +190,7 @@ void nft_chain_attr_set_data(struct nft_chain *c, uint16_t attr, c->handle = *((uint64_t *)data); break; case NFT_CHAIN_ATTR_FAMILY: - c->family = *((uint8_t *)data); + c->family = *((uint32_t *)data); break; case NFT_CHAIN_ATTR_TYPE: if (c->type) @@ -272,7 +272,7 @@ const void *nft_chain_attr_get_data(struct nft_chain *c, uint16_t attr, *data_len = sizeof(uint64_t); return &c->handle; case NFT_CHAIN_ATTR_FAMILY: - *data_len = sizeof(uint8_t); + *data_len = sizeof(uint32_t); return &c->family; case NFT_CHAIN_ATTR_TYPE: *data_len = sizeof(uint32_t); @@ -34,9 +34,9 @@ struct nft_rule { struct list_head head; uint32_t flags; + uint32_t family; const char *table; const char *chain; - uint8_t family; uint64_t handle; uint64_t position; struct { @@ -117,7 +117,7 @@ static uint32_t nft_rule_attr_validate[NFT_RULE_ATTR_MAX + 1] = { [NFT_RULE_ATTR_HANDLE] = sizeof(uint64_t), [NFT_RULE_ATTR_COMPAT_PROTO] = sizeof(uint32_t), [NFT_RULE_ATTR_COMPAT_FLAGS] = sizeof(uint32_t), - [NFT_RULE_ATTR_FAMILY] = sizeof(uint8_t), + [NFT_RULE_ATTR_FAMILY] = sizeof(uint32_t), [NFT_RULE_ATTR_POSITION] = sizeof(uint64_t), }; @@ -152,7 +152,7 @@ void nft_rule_attr_set_data(struct nft_rule *r, uint16_t attr, r->compat.flags = *((uint32_t *)data); break; case NFT_RULE_ATTR_FAMILY: - r->family = *((uint8_t *)data); + r->family = *((uint32_t *)data); break; case NFT_RULE_ATTR_POSITION: r->position = *((uint64_t *)data); @@ -194,7 +194,7 @@ const void *nft_rule_attr_get_data(const struct nft_rule *r, uint16_t attr, switch(attr) { case NFT_RULE_ATTR_FAMILY: - *data_len = sizeof(uint8_t); + *data_len = sizeof(uint32_t); return &r->family; case NFT_RULE_ATTR_TABLE: return r->table; diff --git a/src/table.c b/src/table.c index 33d6a8d..0299209 100644 --- a/src/table.c +++ b/src/table.c @@ -29,7 +29,7 @@ struct nft_table { struct list_head head; const char *name; - uint8_t family; + uint32_t family; uint32_t table_flags; uint32_t use; uint32_t flags; @@ -81,7 +81,7 @@ EXPORT_SYMBOL(nft_table_attr_unset); static uint32_t nft_table_attr_validate[NFT_TABLE_ATTR_MAX + 1] = { [NFT_TABLE_ATTR_FLAGS] = sizeof(uint32_t), - [NFT_TABLE_ATTR_FAMILY] = sizeof(uint8_t), + [NFT_TABLE_ATTR_FAMILY] = sizeof(uint32_t), }; void nft_table_attr_set_data(struct nft_table *t, uint16_t attr, @@ -103,7 +103,7 @@ void nft_table_attr_set_data(struct nft_table *t, uint16_t attr, t->table_flags = *((uint32_t *)data); break; case NFT_TABLE_ATTR_FAMILY: - t->family = *((uint8_t *)data); + t->family = *((uint32_t *)data); break; case NFT_TABLE_ATTR_USE: /* Cannot be set, ignoring it */ @@ -150,7 +150,7 @@ const void *nft_table_attr_get_data(struct nft_table *t, uint16_t attr, *data_len = sizeof(uint32_t); return &t->table_flags; case NFT_TABLE_ATTR_FAMILY: - *data_len = sizeof(uint8_t); + *data_len = sizeof(uint32_t); return &t->family; case NFT_TABLE_ATTR_USE: *data_len = sizeof(uint32_t); |