From 0944e150257211db42ce0e3369be5be684693761 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 17 Mar 2014 23:03:43 +0100 Subject: expr: do not suppress OP_EQ when RHS is bitmask type bitmask types default to flagcmp now, thus do not suppress OP_EQ. Else, rule filter output tcp flags syn rule filter output tcp flags == syn are both displayed as 'flags syn'. Signed-off-by: Florian Westphal --- src/expression.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/expression.c') diff --git a/src/expression.c b/src/expression.c index 13139256..fa14d99c 100644 --- a/src/expression.c +++ b/src/expression.c @@ -514,13 +514,21 @@ static void binop_arg_print(const struct expr *op, const struct expr *arg) printf(")"); } +static bool must_print_eq_op(const struct expr *expr) +{ + if (expr->right->dtype->basetype != NULL && + expr->right->dtype->basetype->type == TYPE_BITMASK) + return true; + + return expr->left->ops->type == EXPR_BINOP; +} + static void binop_expr_print(const struct expr *expr) { binop_arg_print(expr, expr->left); if (expr_op_symbols[expr->op] && - (expr->op != OP_EQ || - expr->left->ops->type == EXPR_BINOP)) + (expr->op != OP_EQ || must_print_eq_op(expr))) printf(" %s ", expr_op_symbols[expr->op]); else printf(" "); -- cgit v1.2.3