diff options
| -rw-r--r-- | ovn/lib/expr.c | 11 | ||||
| -rw-r--r-- | tests/ovn.at | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c index a5dbcfaa4..a197474e3 100644 --- a/ovn/lib/expr.c +++ b/ovn/lib/expr.c @@ -1702,7 +1702,16 @@ expr_simplify_ne(struct expr *expr) new = expr_combine(EXPR_T_OR, new, e); } - ovs_assert(new); + if (!new) { + /* Handle a comparison like "ip4.dst != 0/0", where the mask has no + * 1-bits. + * + * The correct result for this expression may not be obvious. It's + * easier to understand that "ip4.dst == 0/0" should be true, since 0/0 + * matches every IPv4 address; then, "ip4.dst != 0/0" should have the + * opposite result. */ + new = expr_create_boolean(false); + } expr_destroy(expr); diff --git a/tests/ovn.at b/tests/ovn.at index 739bbc916..c691f8226 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -431,6 +431,8 @@ simplify() { } AT_CHECK([simplify 'eth.dst == 0/0'], [0], [1 ]) +AT_CHECK([simplify 'eth.dst != 0/0'], [0], [0 +]) AT_CLEANUP AT_SETUP([ovn -- 4-term numeric expression normalization]) |