evaluate: update byteorder only for implicit maps
Pablo Neira Ayuso
maintainerPATCH 1/2 evaluate: update byteorder only for implicit maps
The byteorder adjustment for the integer datatype is only required by implicit maps.
Fixes b9b6092304ae ("evaluate: store byteorder for set keys")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/evaluate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
src/evaluate.c +2 -1
@@ -84,7 +84,8 @@ static struct expr *implicit_set_declaration(struct eval_ctx *ctx,struct set *set;struct handle h; -key_fix_dtype_byteorder (key); +if (expr->set_flags &NFT_SET_MAP ) +key_fix_dtype_byteorder (key); set =set_alloc (&expr->location); set->flags =NFT_SET_ANONYMOUS | expr->set_flags;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/2 evaluate: double datatype_free() with dynamic integer datatypes
datatype_set() already deals with this case, remove this.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/datatype.h | 1 - src/datatype.c | 5 ----- src/evaluate.c | 2 -- 3 files changed, 8 deletions(-)
include/datatype.h +0 -1
@@ -260,7 +260,6 @@ extern const struct datatype boolean_type;void inet_service_type_print (const struct expr *expr,struct output_ctx *octx);extern const struct datatype *concat_type_alloc (uint32_t type); -extern void concat_type_destroy (const struct datatype *dtype);static inline uint32_t concat_subtype_add (uint32_t type,uint32_t subtype) {
src/datatype.c +0 -5
@@ -1162,11 +1162,6 @@ const struct datatype *concat_type_alloc(uint32_t type)return dtype; } -void concat_type_destroy (const struct datatype *dtype) -{ -datatype_free (dtype); -} -const struct datatype *set_datatype_alloc (const struct datatype *orig_dtype,unsigned int byteorder) {
src/evaluate.c +0 -2
@@ -71,8 +71,6 @@ static void key_fix_dtype_byteorder(struct expr *key)return ;datatype_set (key,set_datatype_alloc (dtype, key->byteorder)); -if (dtype->flags &DTYPE_F_ALLOC ) -concat_type_destroy (dtype); } static struct expr *implicit_set_declaration(struct eval_ctx *ctx,
Signature · 1 line
2.11.0