expr: make range_low()/range_high() usable outside of segtree

Their functionality is also needed for set descriptions, move the functions
to expressions.c and give them a more suitable name for global functions.

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/expression.h b/include/expression.h
index edb6dc502fdf8f8a9526af9b97bf29d2f037a028..59fa5f3dd90ff9cd652bceb6c4b9abf8f64b80eb 100644 (file)
--- a/include/expression.h
+++ b/include/expression.h
@@ -351,4 +351,8 @@ extern struct expr *map_expr_alloc(const struct location *loc,
 extern struct expr *set_ref_expr_alloc(const struct location *loc,
                                       struct set *set);
 
+
+extern void range_expr_value_low(mpz_t rop, const struct expr *expr);
+extern void range_expr_value_high(mpz_t rop, const struct expr *expr);
+
 #endif /* NFTABLES_EXPRESSION_H */

diff --git a/src/expression.c b/src/expression.c
index fa14d99c4692b46035dca6a75d4b3b0035719505..8ba2e8a1a28edd687c03789e9bf30fe9fda31abb 100644 (file)
--- a/src/expression.c
+++ b/src/expression.c
@@ -879,3 +879,41 @@ struct expr *set_ref_expr_alloc(const struct location *loc, struct set *set)
        expr->flags |= EXPR_F_CONSTANT;
        return expr;
 }
+
+void range_expr_value_low(mpz_t rop, const struct expr *expr)
+{
+       switch (expr->ops->type) {
+       case EXPR_VALUE:
+               return mpz_set(rop, expr->value);
+       case EXPR_PREFIX:
+               return range_expr_value_low(rop, expr->prefix);
+       case EXPR_RANGE:
+               return range_expr_value_low(rop, expr->left);
+       case EXPR_MAPPING:
+               return range_expr_value_low(rop, expr->left);
+       default:
+               BUG("invalid range expression type %s\n", expr->ops->name);
+       }
+}
+
+void range_expr_value_high(mpz_t rop, const struct expr *expr)
+{
+       mpz_t tmp;
+
+       switch (expr->ops->type) {
+       case EXPR_VALUE:
+               return mpz_set(rop, expr->value);
+       case EXPR_PREFIX:
+               range_expr_value_low(rop, expr->prefix);
+               mpz_init_bitmask(tmp, expr->len - expr->prefix_len);
+               mpz_add(rop, rop, tmp);
+               mpz_clear(tmp);
+               return;
+       case EXPR_RANGE:
+               return range_expr_value_high(rop, expr->right);
+       case EXPR_MAPPING:
+               return range_expr_value_high(rop, expr->left);
+       default:
+               BUG("invalid range expression type %s\n", expr->ops->name);
+       }
+}

diff --git a/src/segtree.c b/src/segtree.c
index 1785f640feb45c137abfb14d81b87d33146ec668..753d8b846dfb4f9fbc2f9050d12fa0a8e76bacfd 100644 (file)
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -256,44 +256,6 @@ static void ei_insert(struct seg_tree *tree, struct elementary_interval *new)
        mpz_clear(p);
 }
 
-static void range_low(mpz_t rop, struct expr *expr)
-{
-       switch (expr->ops->type) {
-       case EXPR_VALUE:
-               return mpz_set(rop, expr->value);
-       case EXPR_PREFIX:
-               return range_low(rop, expr->prefix);
-       case EXPR_RANGE:
-               return range_low(rop, expr->left);
-       case EXPR_MAPPING:
-               return range_low(rop, expr->left);
-       default:
-               BUG("invalid range expression type %s\n", expr->ops->name);
-       }
-}
-
-static void range_high(mpz_t rop, const struct expr *expr)
-{
-       mpz_t tmp;
-
-       switch (expr->ops->type) {
-       case EXPR_VALUE:
-               return mpz_set(rop, expr->value);
-       case EXPR_PREFIX:
-               range_low(rop, expr->prefix);
-               mpz_init_bitmask(tmp, expr->len - expr->prefix_len);
-               mpz_add(rop, rop, tmp);
-               mpz_clear(tmp);
-               return;
-       case EXPR_RANGE:
-               return range_high(rop, expr->right);
-       case EXPR_MAPPING:
-               return range_high(rop, expr->left);
-       default:
-               BUG("invalid range expression type %s\n", expr->ops->name);
-       }
-}
-
 /*
  * Sort intervals according to their priority, which is defined inversely to
  * their size.
@@ -353,8 +315,8 @@ static int set_to_segtree(struct list_head *msgs, struct expr *set,
         */
        n = 0;
        list_for_each_entry_safe(i, next, &set->expressions, list) {
-               range_low(low, i);
-               range_high(high, i);
+               range_expr_value_low(low, i);
+               range_expr_value_high(high, i);
                ei = ei_alloc(low, high, i, 0);
                intervals[n++] = ei;