From patchwork Wed Nov 28 12:59:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 202444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3A0F02C008C for ; Wed, 28 Nov 2012 23:59:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754905Ab2K1M7c (ORCPT ); Wed, 28 Nov 2012 07:59:32 -0500 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:53572 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754284Ab2K1M7b (ORCPT ); Wed, 28 Nov 2012 07:59:31 -0500 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.72) (envelope-from ) id 1TdhEg-0003T7-Cn for netfilter-devel@vger.kernel.org; Wed, 28 Nov 2012 13:59:30 +0100 Date: Wed, 28 Nov 2012 13:59:30 +0100 From: Florian Westphal To: netfilter-devel@vger.kernel.org Subject: lnf_conntrack: nfct_cmp NFCT_CMP_TIMEOUT_* flags not supported? Message-ID: <20121128125930.GF14156@breakpoint.cc> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Hi. I added api_tests for the various nfct_cmp timeout flags. And guess what: They don't work 8-} It fails on the 2nd assert below: assert(nfct_cmp(ct, ct2, NFCT_CMP_TIMEOUT_EQ) == 1); nfct_set_attr_u32(ct2, ATTR_TIMEOUT, nfct_get_attr_u32(ct, ATTR_TIMEOUT) + 1); assert(nfct_cmp(ct2, ct, NFCT_CMP_TIMEOUT_EQ) == 0); The reason is that __compare() doesn't know about NFCT_CMP_TIMEOUT* flags and returns 1 unconditionally. So, my question is: How are the NFCT_CMP_TIMEOUT flags supposed to be used? From the documentation it appears as if they should be used together with _ALL, _ORIG, _REPLY, or even standalone, i.e. __compare needs to check for these, too: With the above change the new tests pass. --- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/conntrack/compare.c b/src/conntrack/compare.c index b18f7fc..7cd28e7 100644 --- a/src/conntrack/compare.c +++ b/src/conntrack/compare.c @@ -407,5 +407,8 @@ int __compare(const struct nf_conntrack *ct1, if (flags & NFCT_CMP_REPL && !cmp_repl(ct1, ct2, flags)) return 0; + if (flags & (NFCT_CMP_TIMEOUT_GT|NFCT_CMP_TIMEOUT_LE)) + return cmp_meta(ct1, ct2, flags); + return 1; }