Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01ECCC43334 for ; Mon, 20 Jun 2022 08:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239703AbiFTIcf (ORCPT ); Mon, 20 Jun 2022 04:32:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239702AbiFTIc3 (ORCPT ); Mon, 20 Jun 2022 04:32:29 -0400 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7BEB812A9B for ; Mon, 20 Jun 2022 01:32:26 -0700 (PDT) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nft 07/18] optimize: add osf expression support Date: Mon, 20 Jun 2022 10:32:04 +0200 Message-Id: <20220620083215.1021238-8-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220620083215.1021238-1-pablo@netfilter.org> References: <20220620083215.1021238-1-pablo@netfilter.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Extend expr_cmp() to compare osf expressions used in relational. Signed-off-by: Pablo Neira Ayuso --- src/optimize.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/optimize.c b/src/optimize.c index 747282b4d7f4..04c92575c4b0 100644 --- a/src/optimize.c +++ b/src/optimize.c @@ -81,6 +81,12 @@ static bool __expr_cmp(const struct expr *expr_a, const struct expr *expr_b) if (expr_a->socket.level != expr_b->socket.level) return false; break; + case EXPR_OSF: + if (expr_a->osf.ttl != expr_b->osf.ttl) + return false; + if (expr_a->osf.flags != expr_b->osf.flags) + return false; + break; default: return false; } -- 2.30.2