diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-01-04 17:16:39 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-01-04 17:16:39 +0100 |
| commit | 8e63e483240687ee4c4325073d84926e39416bc9 (patch) | |
| tree | 54848f691373638fc54c84c5f87938e18977f6b1 /src/conntrack | |
| parent | 849342adcb7099d23b39192a4369908bb0259eee (diff) | |
expect: add nfexp_cmp
This patch adds nfexp_cmp that allows you to compare two expectation
objects.
This includes the extension of test_api for this new function.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/conntrack')
| -rw-r--r-- | src/conntrack/compare.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/conntrack/compare.c b/src/conntrack/compare.c index f94f1b9..830195f 100644 --- a/src/conntrack/compare.c +++ b/src/conntrack/compare.c @@ -144,9 +144,9 @@ cmp_orig_ipv6_dst(const struct nf_conntrack *ct1, sizeof(struct in6_addr)) == 0); } -static int cmp_orig(const struct nf_conntrack *ct1, - const struct nf_conntrack *ct2, - unsigned int flags) +int __cmp_orig(const struct nf_conntrack *ct1, + const struct nf_conntrack *ct2, + unsigned int flags) { if (!__cmp(ATTR_ORIG_L3PROTO, ct1, ct2, flags, cmp_orig_l3proto)) return 0; @@ -399,10 +399,10 @@ int __compare(const struct nf_conntrack *ct1, { if ((flags & ~(NFCT_CMP_MASK|NFCT_CMP_STRICT)) == NFCT_CMP_ALL) return cmp_meta(ct1, ct2, flags) && - cmp_orig(ct1, ct2, flags) && + __cmp_orig(ct1, ct2, flags) && cmp_repl(ct1, ct2, flags); - if (flags & NFCT_CMP_ORIG && !cmp_orig(ct1, ct2, flags)) + if (flags & NFCT_CMP_ORIG && !__cmp_orig(ct1, ct2, flags)) return 0; if (flags & NFCT_CMP_REPL && !cmp_repl(ct1, ct2, flags)) |