* [PATCH nft] netlink_delinearize: remove integer_type_postprocess()
@ 2017-02-25 11:08 Pablo Neira Ayuso
0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2017-02-25 11:08 UTC (permalink / raw)
To: netfilter-devel
Not required anymore since the set definition now comes with the right
byteorder for integer types via NFTA_SET_USERDATA area. So we don't need
to look at the lhs anymore. Note that this was a workaround that does
not work with named sets, where we cannot assume we have a lhs, since
it is valid to have a named set that is not referenced from any rule.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/netlink_delinearize.c | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 90553836be79..57b8fa5127e5 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -1277,33 +1277,6 @@ struct stmt *netlink_parse_set_expr(const struct set *set,
static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp);
-static void integer_type_postprocess(struct expr *expr)
-{
- struct expr *i;
-
- switch (expr->ops->type) {
- case EXPR_VALUE:
- if (expr->byteorder == BYTEORDER_HOST_ENDIAN) {
- uint32_t len = div_round_up(expr->len, BITS_PER_BYTE);
-
- mpz_switch_byteorder(expr->value, len);
- }
- break;
- case EXPR_SET_REF:
- list_for_each_entry(i, &expr->set->init->expressions, list) {
- expr_set_type(i, expr->dtype, expr->byteorder);
- integer_type_postprocess(i);
- }
- break;
- case EXPR_SET_ELEM:
- expr_set_type(expr->key, expr->dtype, expr->byteorder);
- integer_type_postprocess(expr->key);
- break;
- default:
- break;
- }
-}
-
static void payload_match_expand(struct rule_pp_ctx *ctx,
struct expr *expr,
struct expr *payload)
@@ -1392,8 +1365,6 @@ static void ct_meta_common_postprocess(const struct expr *expr)
break;
case OP_LOOKUP:
expr_set_type(right, left->dtype, left->byteorder);
- if (right->dtype == &integer_type)
- integer_type_postprocess(right);
break;
default:
--
2.1.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-02-25 11:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-25 11:08 [PATCH nft] netlink_delinearize: remove integer_type_postprocess() Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).