netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* lnf_conntrack: nfct_cmp NFCT_CMP_TIMEOUT_* flags not supported?
@ 2012-11-28 12:59 Florian Westphal
  2012-11-28 15:16 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 3+ messages in thread
From: Florian Westphal @ 2012-11-28 12:59 UTC (permalink / raw)
  To: netfilter-devel

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:

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;
 }

With the above change the new tests pass.

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-11-28 15:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-28 12:59 lnf_conntrack: nfct_cmp NFCT_CMP_TIMEOUT_* flags not supported? Florian Westphal
2012-11-28 15:16 ` Pablo Neira Ayuso
2012-11-28 15:33   ` Florian Westphal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).