summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2020-08-20 01:05:04 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2020-08-20 01:05:04 +0200
commit3926a3369bb5ada5c0706dadcbcf938517822a35 (patch)
tree629983583e9b99d96786caa531eaef494c875d00 /src
parentf8b1bc9d95920d977ee2a24bbda3f97cb563b1bc (diff)
mergesort: unbreak listing with binops
tcp flags == {syn, syn|ack} tcp flags & (fin|syn|rst|psh|ack|urg) == {ack, psh|ack, fin, fin|psh|ack} results in: BUG: Unknown expression binop nft: mergesort.c:47: expr_msort_cmp: Assertion `0' failed. Aborted (core dumped) Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/mergesort.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mergesort.c b/src/mergesort.c
index 649b7806..02094b48 100644
--- a/src/mergesort.c
+++ b/src/mergesort.c
@@ -43,6 +43,8 @@ static int expr_msort_cmp(const struct expr *e1, const struct expr *e2)
return concat_expr_msort_cmp(e1, e2);
case EXPR_MAPPING:
return expr_msort_cmp(e1->left, e2->left);
+ case EXPR_BINOP:
+ return expr_msort_cmp(e1->left, e2->left);
default:
BUG("Unknown expression %s\n", expr_name(e1));
}