From 2dfb973c0dcc6d22113e2370f461f1733035baaf Mon Sep 17 00:00:00 2001 From: Vytas Dauksa Date: Tue, 17 Dec 2013 14:01:44 +0000 Subject: add markmask for hash:ip,mark data type Introduce packet mark mask for hash:ip,mark data type. This allows to set mark bit filter for the ip set. Change-Id: Id8dd9ca7e64477c4f7b022a1d9c1a5b187f1c96e Signed-off-by: Jozsef Kadlecsik --- tests/hash:ip,mark.t | 10 ++++++++++ tests/hash:ip,mark.t.list0 | 2 +- tests/hash:ip,mark.t.list1 | 2 +- tests/hash:ip6,mark.t | 10 ++++++++++ tests/hash:ip6,mark.t.list0 | 2 +- tests/hash:ip6,mark.t.list1 | 2 +- tests/ipmarkhash.t.list0 | 2 +- tests/ipmarkhash.t.list1 | 2 +- 8 files changed, 26 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/hash:ip,mark.t b/tests/hash:ip,mark.t index bd5c237..ad76274 100644 --- a/tests/hash:ip,mark.t +++ b/tests/hash:ip,mark.t @@ -122,4 +122,14 @@ 0 ./check_extensions test 2.0.0.20 700 13 12479 # Counters and timeout: destroy set 0 ipset x test +# Create a set with 65502 ( 0x0000FFDE ) markmask +0 ipset create test hash:ip,mark markmask 0x0000FFDE +# Add first value with 86111010 ( 0x0521F322 ) mark +0 ipset add test 19.16.1.254,0x0521F322 +# Test last entry mark was modified to 62210 ( 0x0000F302 ) +0 ipset test test 19.16.1.254,0x0000F302 +# Test that mask is applied for tests as well +0 ipset test test 19.16.1.254,0x0521F322 +# Destroy set +0 ipset x test # eof diff --git a/tests/hash:ip,mark.t.list0 b/tests/hash:ip,mark.t.list0 index 378dabe..d83b206 100644 --- a/tests/hash:ip,mark.t.list0 +++ b/tests/hash:ip,mark.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet hashsize 1024 maxelem 65536 timeout x +Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 timeout x Size in memory: 8836 References: 0 Members: diff --git a/tests/hash:ip,mark.t.list1 b/tests/hash:ip,mark.t.list1 index af8a38b..400f999 100644 --- a/tests/hash:ip,mark.t.list1 +++ b/tests/hash:ip,mark.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet hashsize 1024 maxelem 65536 timeout 5 +Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 timeout 5 Size in memory: 8836 References: 0 Members: diff --git a/tests/hash:ip6,mark.t b/tests/hash:ip6,mark.t index bc7757b..5c243fa 100644 --- a/tests/hash:ip6,mark.t +++ b/tests/hash:ip6,mark.t @@ -224,4 +224,14 @@ 0 ./check_extensions test 2::20 700 13 12479 # Counters and timeout: destroy set 0 ipset x test +# Create a set with 65502 ( 0x0000FFDE ) markmask +0 ipset create test hash:ip,mark family inet6 markmask 0x0000FFDE +# Add first value with 86111010 ( 0x0521F322 ) mark +0 ipset add test 2:1::1,0x0521F322 +# Test last entry mark was modified to 62210 ( 0x0000F302 ) +0 ipset test test 2:1::1,0x0000F302 +# Test that mask is applied for tests as well +0 ipset test test 2:1::1,0x0521F322 +# Destroy set +0 ipset x test # eof diff --git a/tests/hash:ip6,mark.t.list0 b/tests/hash:ip6,mark.t.list0 index 3ddc56a..0cd930b 100644 --- a/tests/hash:ip6,mark.t.list0 +++ b/tests/hash:ip6,mark.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet6 hashsize 1024 maxelem 65536 timeout x +Header: family inet6 markmask 4294967295 hashsize 1024 maxelem 65536 timeout x Size in memory: 9316 References: 0 Members: diff --git a/tests/hash:ip6,mark.t.list1 b/tests/hash:ip6,mark.t.list1 index 3759448..44bc1da 100644 --- a/tests/hash:ip6,mark.t.list1 +++ b/tests/hash:ip6,mark.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 +Header: family inet6 markmask 4294967295 hashsize 1024 maxelem 65536 timeout 5 Size in memory: 9316 References: 0 Members: diff --git a/tests/ipmarkhash.t.list0 b/tests/ipmarkhash.t.list0 index 201a687..4ada53a 100644 --- a/tests/ipmarkhash.t.list0 +++ b/tests/ipmarkhash.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 Size in memory: 8516 References: 0 Members: diff --git a/tests/ipmarkhash.t.list1 b/tests/ipmarkhash.t.list1 index 2b0265b..74d2869 100644 --- a/tests/ipmarkhash.t.list1 +++ b/tests/ipmarkhash.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 Size in memory: 8468 References: 0 Members: -- cgit v1.2.3