summaryrefslogtreecommitdiffstats
path: root/tests/py
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2017-06-07 12:20:50 +0200
committerFlorian Westphal <fw@strlen.de>2017-06-07 17:28:50 +0200
commit8ba13b7424fbfa18bd1aeebd1c4add67a1f6d2a2 (patch)
tree34b99739598cd2f3dd1b560893f8b99e20815cb5 /tests/py
parentcb8f81ac3079a5bb4b9bf49215f24db10fd8914f (diff)
src: rename ct eventmask to event
ct status isn't named 'statusmask' either. Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py')
-rw-r--r--tests/py/any/ct.t11
-rw-r--r--tests/py/any/ct.t.payload21
2 files changed, 19 insertions, 13 deletions
diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t
index 667126e6..20f047a2 100644
--- a/tests/py/any/ct.t
+++ b/tests/py/any/ct.t
@@ -100,11 +100,12 @@ ct original mark 42;fail
# swapped key and direction
ct mark original;fail
-ct eventmask set new;ok
-ct eventmask set new or related or destroy or foobar;fail
-ct eventmask set 'new | related | destroy | label';ok;ct eventmask set new | related | destroy | label
-ct eventmask set 1;ok;ct eventmask set new
-ct eventmask set 0x0;ok
+ct event set new;ok
+ct event set new or related or destroy or foobar;fail
+ct event set 'new | related | destroy | label';ok;ct event set new,related,destroy,label
+ct event set new,destroy;ok
+ct event set 1;ok;ct event set new
+ct event set 0x0;ok
ct label 127;ok
ct label set 127;ok
diff --git a/tests/py/any/ct.t.payload b/tests/py/any/ct.t.payload
index c5fa7c8d..80513c80 100644
--- a/tests/py/any/ct.t.payload
+++ b/tests/py/any/ct.t.payload
@@ -398,25 +398,30 @@ ip test-ip4 output
[ bitwise reg 1 = (reg=1 & 0x00000020 ) ^ 0x00000000 ]
[ cmp neq reg 1 0x00000000 ]
-# ct eventmask set new
+# ct event set new
ip test-ip4 output
[ immediate reg 1 0x00000001 ]
- [ ct set eventmask with reg 1 ]
+ [ ct set event with reg 1 ]
-# ct eventmask set 'new | related | destroy | label'
+# ct event set 'new | related | destroy | label'
ip test-ip4 output
[ immediate reg 1 0x00000407 ]
- [ ct set eventmask with reg 1 ]
+ [ ct set event with reg 1 ]
-# ct eventmask set 1
+# ct event set new,destroy
+ip test-ip4 output
+ [ immediate reg 1 0x00000005 ]
+ [ ct set event with reg 1 ]
+
+# ct event set 1
ip test-ip4 output
[ immediate reg 1 0x00000001 ]
- [ ct set eventmask with reg 1 ]
+ [ ct set event with reg 1 ]
-# ct eventmask set 0x0
+# ct event set 0x0
ip test-ip4 output
[ immediate reg 1 0x00000000 ]
- [ ct set eventmask with reg 1 ]
+ [ ct set event with reg 1 ]
# ct label 127
ip test-ip4 output