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>

diff --git a/doc/nft.xml b/doc/nft.xml
index faf0ffde9e191e1c8f5c48e5fa6298b4ecf44f85..d0d37396dddfe6cccea867a79b19aabb2ee084cf 100644 (file)
--- a/doc/nft.xml
+++ b/doc/nft.xml
@@ -3876,7 +3876,7 @@ ip6 filter output log flags all
                                        <command>ct</command>
                                        <group choice="req">
                                                <arg>mark</arg>
-                                               <arg>eventmask</arg>
+                                               <arg>event</arg>
                                                <arg>label</arg>
                                                <arg>zone</arg>
                                        </group>
@@ -3907,7 +3907,7 @@ ip6 filter output log flags all
                                                </thead>
                                                <tbody>
                                                        <row>
-                                                               <entry>eventmask</entry>
+                                                               <entry>event</entry>
                                                                <entry>conntrack event bits</entry>
                                                                <entry>bitmask, integer (32 bit)</entry>
                                                        </row>
@@ -3962,7 +3962,7 @@ table inet raw {
                        <example>
                                        <title>restrict events reported by ctnetlink</title>
                                <programlisting>
-ct eventmask set new or related or destroy
+ct event set new,related,destroy
                                </programlisting>
                        </example>
 

diff --git a/src/ct.c b/src/ct.c
index 5014265a3427afe3af503d29baa293ede6028a5a..ab50a16684047c81bee979088b2161190c0d540d 100644 (file)
--- a/src/ct.c
+++ b/src/ct.c
@@ -264,7 +264,7 @@ static const struct ct_template ct_templates[] = {
                                              BYTEORDER_HOST_ENDIAN, 64),
        [NFT_CT_ZONE]           = CT_TEMPLATE("zone", &integer_type,
                                              BYTEORDER_HOST_ENDIAN, 16),
-       [NFT_CT_EVENTMASK]      = CT_TEMPLATE("eventmask", &ct_event_type,
+       [NFT_CT_EVENTMASK]      = CT_TEMPLATE("event", &ct_event_type,
                                              BYTEORDER_HOST_ENDIAN, 32),
 };
 

diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t
index 667126e656ae56d0eeb476e8dee1a785db694027..20f047a2963ba468d4aa06f9a7d1270b910428b4 100644 (file)
--- 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 c5fa7c8d49e4ef71f5df163aecf91d344b55b170..80513c80355777a3a624a8130033fbbff0545370 100644 (file)
--- 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