diff mbox

[conntrack,4/4] tests: conntrack: add tests for CIDR notation

Message ID 1454333407-6335-4-git-send-email-ast@fiberby.dk
State Accepted
Delegated to: Pablo Neira
Headers show

Commit Message

Asbjørn Sloth Tønnesen Feb. 1, 2016, 1:30 p.m. UTC
Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.dk>
---
 tests/conntrack/testsuite/01delete | 4 ++++
 tests/conntrack/testsuite/02filter | 2 ++
 2 files changed, 6 insertions(+)

Comments

Pablo Neira Ayuso Feb. 16, 2016, 6:20 p.m. UTC | #1
On Mon, Feb 01, 2016 at 01:30:07PM +0000, Asbjørn Sloth Tønnesen wrote:
> Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.dk>
> ---
>  tests/conntrack/testsuite/01delete | 4 ++++
>  tests/conntrack/testsuite/02filter | 2 ++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/tests/conntrack/testsuite/01delete b/tests/conntrack/testsuite/01delete
> index 566b89f..194d999 100644
> --- a/tests/conntrack/testsuite/01delete
> +++ b/tests/conntrack/testsuite/01delete
> @@ -10,3 +10,7 @@
>  -D -s 1.1.1.0 --mask-src 255.255.255.0 -d 2.2.2.0 --mask-dst 255.255.255.0 ; OK
>  # fails due to 0 matches
>  -D -s 1.1.1.0 --mask-src 255.255.255.0 -d 2.2.2.0 --mask-dst 255.255.255.0 ; BAD
> +# re-create dummy
> +-I -s 1.1.1.1 -d 2.2.2.2 -p tcp --sport 10 --dport 20 --state LISTEN -u SEEN_REPLY -t 50 ; OK
> +# try same command again but with CIDR
> +-D -s 1.1.1.0/24 -d 2.2.2.0/24 ; OK
> diff --git a/tests/conntrack/testsuite/02filter b/tests/conntrack/testsuite/02filter
> index 5d2270b..58ed070 100644
> --- a/tests/conntrack/testsuite/02filter
> +++ b/tests/conntrack/testsuite/02filter
> @@ -21,5 +21,7 @@ conntrack -L --mark 0 ; OK
>  conntrack -L --mark 0/0xffffffff; OK
>  # filter by netmask
>  conntrack -L -s 1.1.1.0 --mask-src 255.255.255.0 -d 2.0.0.0 --mask-dst 255.0.0.0 ; OK
> +conntrack -L -s 1.1.1.4/24 -d 2.3.4.5/8 ; OK
> +conntrack -L -s 1.1.2.0/24 -d 2.3.4.5/8 ; BAD

I have mangled the line above from BAD to OK. The listing above
actually works fine, even if it returns no entries. The tests are not
capable of catching this at the moment IIRC.

So applied, thanks.
--
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 mbox

Patch

diff --git a/tests/conntrack/testsuite/01delete b/tests/conntrack/testsuite/01delete
index 566b89f..194d999 100644
--- a/tests/conntrack/testsuite/01delete
+++ b/tests/conntrack/testsuite/01delete
@@ -10,3 +10,7 @@ 
 -D -s 1.1.1.0 --mask-src 255.255.255.0 -d 2.2.2.0 --mask-dst 255.255.255.0 ; OK
 # fails due to 0 matches
 -D -s 1.1.1.0 --mask-src 255.255.255.0 -d 2.2.2.0 --mask-dst 255.255.255.0 ; BAD
+# re-create dummy
+-I -s 1.1.1.1 -d 2.2.2.2 -p tcp --sport 10 --dport 20 --state LISTEN -u SEEN_REPLY -t 50 ; OK
+# try same command again but with CIDR
+-D -s 1.1.1.0/24 -d 2.2.2.0/24 ; OK
diff --git a/tests/conntrack/testsuite/02filter b/tests/conntrack/testsuite/02filter
index 5d2270b..58ed070 100644
--- a/tests/conntrack/testsuite/02filter
+++ b/tests/conntrack/testsuite/02filter
@@ -21,5 +21,7 @@  conntrack -L --mark 0 ; OK
 conntrack -L --mark 0/0xffffffff; OK
 # filter by netmask
 conntrack -L -s 1.1.1.0 --mask-src 255.255.255.0 -d 2.0.0.0 --mask-dst 255.0.0.0 ; OK
+conntrack -L -s 1.1.1.4/24 -d 2.3.4.5/8 ; OK
+conntrack -L -s 1.1.2.0/24 -d 2.3.4.5/8 ; BAD
 # delete dummy
 conntrack -D -d 2.2.2.2 ; OK