nat: transform range to prefix expression when possible
Pablo Neira Ayuso
maintainerPATCH 1/1 nat: transform range to prefix expression when possible
This patch transform a range of IP addresses to prefix when listing the ruleset.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/expression.h | 1 + src/netlink.c | 4 ++-- src/netlink_delinearize.c | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-)
include/expression.h +1 -0
@@ -452,6 +452,7 @@ extern struct expr *prefix_expr_alloc(const struct location *loc,extern struct expr *range_expr_alloc (const struct location *loc,struct expr *low,struct expr *high); +struct expr *range_expr_to_prefix (struct expr *range);extern struct expr *compound_expr_alloc (const struct location *loc,enum expr_types etypes);
src/netlink.c +2 -2
@@ -949,7 +949,7 @@ static uint32_t mpz_bitmask_to_prefix(mpz_t bitmask, uint32_t len)return len -mpz_scan0 (bitmask,0 ); } -static struct expr *expr_range_to_prefix (struct expr *range) +struct expr *range_expr_to_prefix (struct expr *range) {struct expr *left = range->left, *right = range->right, *prefix;uint32_t len = left->len, prefix_len;
@@ -989,7 +989,7 @@ static struct expr *netlink_parse_interval_elem(const struct datatype *dtype, range =range_expr_alloc (&expr->location, left, right);expr_free (expr); -return expr_range_to_prefix (range); +return range_expr_to_prefix (range); } static struct expr *netlink_parse_concat_elem(const struct datatype *dtype,
src/netlink_delinearize.c +5 -1
@@ -1103,8 +1103,10 @@ static void netlink_parse_nat(struct netlink_parse_ctx *ctx,else expr_set_type (addr, &ip6addr_type,BYTEORDER_BIG_ENDIAN ); -if (stmt->nat.addr !=NULL ) +if (stmt->nat.addr !=NULL ) { addr =range_expr_alloc (loc, stmt->nat.addr, addr); + addr =range_expr_to_prefix (addr); + } stmt->nat.addr = addr; }
@@ -2296,6 +2298,8 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)case EXPR_RANGE :expr_postprocess (ctx, &expr->left);expr_postprocess (ctx, &expr->right); +case EXPR_PREFIX : +expr_postprocess (ctx, &expr->prefix);break ;case EXPR_SET_ELEM :expr_postprocess (ctx, &expr->key);
Signature · 1 line
2.20.1