diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-04-13 04:01:30 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-04-13 13:44:03 +0200 |
commit | e0beff27435433ce2fd2826496774a539df73d65 (patch) | |
tree | 20cf0c72c3ce4bb61467d8954111450c952f752e /src/expression.c | |
parent | 3e8d934e4f7224b0db64f89e9097370630062064 (diff) |
src: restore interval sets work with string datatypes
Switch byteorder of string datatypes to host byteorder.
Partial revert of ("src: make interval sets work with string datatypes")
otherwise new interval code complains with conflicting intervals.
testcases/sets/sets_with_ifnames passes fine again.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expression.c')
-rw-r--r-- | src/expression.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/expression.c b/src/expression.c index 5d879b53..deb649e1 100644 --- a/src/expression.c +++ b/src/expression.c @@ -1442,11 +1442,7 @@ void range_expr_value_low(mpz_t rop, const struct expr *expr) { switch (expr->etype) { case EXPR_VALUE: - mpz_set(rop, expr->value); - if (expr->byteorder == BYTEORDER_HOST_ENDIAN && - expr_basetype(expr)->type == TYPE_STRING) - mpz_switch_byteorder(rop, expr->len / BITS_PER_BYTE); - return; + return mpz_set(rop, expr->value); case EXPR_PREFIX: return range_expr_value_low(rop, expr->prefix); case EXPR_RANGE: @@ -1466,7 +1462,7 @@ void range_expr_value_high(mpz_t rop, const struct expr *expr) switch (expr->etype) { case EXPR_VALUE: - return range_expr_value_low(rop, expr); + return mpz_set(rop, expr->value); case EXPR_PREFIX: range_expr_value_low(rop, expr->prefix); assert(expr->len >= expr->prefix_len); |