From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
To: Florian Westphal <fw@strlen.de>
Cc: The netfilter developer mailinglist <netfilter-devel@vger.kernel.org>
Subject: [PATCH v3 1/2 libnetfilter_conntrack] qa: update cmp ATTR_ZONE size mark and zone
Date: Mon, 23 Jun 2014 19:15:19 +0900 [thread overview]
Message-ID: <20140623101519.GB29052@gmail.com> (raw)
In-Reply-To: <20140623101235.GA29052@gmail.com>
---
qa/test_api.c | 102 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 78 insertions(+), 24 deletions(-)
diff --git a/qa/test_api.c b/qa/test_api.c
index 91b3dbf..1335b23 100644
--- a/qa/test_api.c
+++ b/qa/test_api.c
@@ -243,17 +243,17 @@ static int test_nfct_cmp_api_single(struct nf_conntrack *ct1,
return 0;
}
-static int test_cmp_attr32(int attr, bool at1, bool at2,
- uint32_t v1, uint32_t v2, unsigned int flags)
+static int test_cmp_attr16(int attr, bool at1, bool at2,
+ uint16_t v1, uint16_t v2, unsigned int flags)
{
struct nf_conntrack *ct1 = nfct_new();
struct nf_conntrack *ct2 = nfct_new();
int ret;
if (at1)
- nfct_set_attr_u32(ct1, attr, v1);
+ nfct_set_attr_u16(ct1, attr, v1);
if (at2)
- nfct_set_attr_u32(ct2, attr, v2);
+ nfct_set_attr_u16(ct2, attr, v2);
ret = nfct_cmp(ct1, ct2, NFCT_CMP_ALL | flags);
@@ -264,26 +264,80 @@ static int test_cmp_attr32(int attr, bool at1, bool at2,
}
static void test_nfct_cmp_attr(int attr)
{
- assert(test_cmp_attr32(ATTR_ZONE, false, false, 0, 0, 0) == 1);
- assert(test_cmp_attr32(ATTR_ZONE, true, true, 0, 0, 0) == 1);
- assert(test_cmp_attr32(ATTR_ZONE, true, true, 1, 1, 0) == 1);
-
- /* This compare should be true */
- assert(test_cmp_attr32(ATTR_ZONE, false, true, 0, 1, 0) == 1);
-
- assert(test_cmp_attr32(ATTR_ZONE, true, true, 1, 1, NFCT_CMP_STRICT) == 1);
-
- assert(test_cmp_attr32(ATTR_ZONE, true, false, 0, 0, NFCT_CMP_STRICT) == 1);
- assert(test_cmp_attr32(ATTR_ZONE, false, true, 0, 0, NFCT_CMP_STRICT) == 1);
-
- assert(test_cmp_attr32(ATTR_ZONE, false, true, 0, 1, NFCT_CMP_STRICT) == 0);
-
- assert(test_cmp_attr32(ATTR_ZONE, false, true, 0, 1, NFCT_CMP_MASK) == 1);
- assert(test_cmp_attr32(ATTR_ZONE, true, true, 0, 1, NFCT_CMP_MASK) == 0);
-
- assert(test_cmp_attr32(ATTR_ZONE, true, false, 0, 0, NFCT_CMP_MASK) == 1);
-
- assert(test_cmp_attr32(ATTR_ZONE, true, false, 1, 0, NFCT_CMP_MASK) == 0);
+ unsigned int flags = 0;
+
+ /* 0000, 1000, 1100, 0010, 1010... */
+ /* attr at1 at2 v1 v2 */
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 1, 0, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 1, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 1, 0, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 1, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 0, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 0, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 0, 1, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 0, 1, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 1, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 1, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 1, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 1, 1, flags) == 1);
+
+ flags = NFCT_CMP_STRICT;
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 0, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 0, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 1, 0, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 1, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 1, 0, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 1, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 0, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 0, 1, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 0, 1, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 0, 1, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 1, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 1, 1, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 1, 1, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 1, 1, flags) == 1);
+
+ flags = NFCT_CMP_MASK;
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 0, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 1, 0, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 1, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 1, 0, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 1, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 0, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 0, 1, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 0, 1, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 0, 1, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 1, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 1, 1, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 1, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 1, 1, flags) == 1);
+
+ flags = NFCT_CMP_STRICT|NFCT_CMP_MASK;
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 0, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 0, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 0, 0, flags) == 1);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 1, 0, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 1, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 1, 0, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 1, 0, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 0, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 0, 1, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 0, 1, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 0, 1, flags) == 0);
+ assert(test_cmp_attr16(ATTR_ZONE, false, false, 1, 1, flags) == 1); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, false, 1, 1, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, false, true, 1, 1, flags) == 0); /* verbose */
+ assert(test_cmp_attr16(ATTR_ZONE, true, true, 1, 1, flags) == 1);
}
static void test_nfct_cmp_api(struct nf_conntrack *ct1, struct nf_conntrack *ct2)
--
1.9.1
next prev parent reply other threads:[~2014-06-23 10:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 12:04 [PATCH v2 libnetfilter_conntrack] zero value handling of mark and zone Ken-ichirou MATSUZAWA
2014-06-17 16:40 ` Florian Westphal
2014-06-19 15:16 ` Florian Westphal
2014-06-23 10:12 ` [PATCH v3 0/2 " Ken-ichirou MATSUZAWA
2014-06-23 10:15 ` Ken-ichirou MATSUZAWA [this message]
2014-06-24 15:23 ` [PATCH v3 1/2 libnetfilter_conntrack] qa: update cmp ATTR_ZONE size " Florian Westphal
2014-06-23 10:18 ` [PATCH v3 2/2 libnetfilter_conntrack] conntrack: zero value handling of " Ken-ichirou MATSUZAWA
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140623101519.GB29052@gmail.com \
--to=chamaken@gmail.com \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.