[PATCH nft 1/2] tests: sets: don't include listing in payload tests

netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH nft 1/2] tests: sets: don't include listing in payload tests
@ 2015-08-18  5:08 Pablo Neira Ayuso
  2015-08-18  5:08 ` [PATCH nft 2/2] tests: redirect: fix payload display Pablo Neira Ayuso
  0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2015-08-18  5:08 UTC (permalink / raw)
  To: netfilter-devel; +Cc: fw

Since e715f6d1241c ("netlink: don't call netlink_dump_*() from listing
functions with --debug=netlink"), there is no debugging from the listing path.
Thus, we can remove the set line from the test files.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/regression/ip/sets.t.payload.inet  |    2 --
 tests/regression/ip/sets.t.payload.ip    |    2 --
 tests/regression/ip6/sets.t.payload.inet |    1 -
 tests/regression/ip6/sets.t.payload.ip6  |    1 -
 4 files changed, 6 deletions(-)

diff --git a/tests/regression/ip/sets.t.payload.inet b/tests/regression/ip/sets.t.payload.inet
index 9041781..f8e97cc 100644
--- a/tests/regression/ip/sets.t.payload.inet
+++ b/tests/regression/ip/sets.t.payload.inet
@@ -1,5 +1,4 @@
 # ip saddr @set1 drop
-set1 test-inet 0
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x00000002 ]
@@ -8,7 +7,6 @@ inet test-inet input
   [ immediate reg 0 drop ]
 
 # ip saddr @set2 drop
-set2 test-inet 0
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x00000002 ]
diff --git a/tests/regression/ip/sets.t.payload.ip b/tests/regression/ip/sets.t.payload.ip
index eb3770e..ece63d0 100644
--- a/tests/regression/ip/sets.t.payload.ip
+++ b/tests/regression/ip/sets.t.payload.ip
@@ -1,12 +1,10 @@
 # ip saddr @set1 drop
-set1 test-ip4 0
 ip test-ip4 input
   [ payload load 4b @ network header + 12 => reg 1 ]
   [ lookup reg 1 set set1 ]
   [ immediate reg 0 drop ]
 
 # ip saddr @set2 drop
-set2 test-ip4 0
 ip test-ip4 input
   [ payload load 4b @ network header + 12 => reg 1 ]
   [ lookup reg 1 set set2 ]
diff --git a/tests/regression/ip6/sets.t.payload.inet b/tests/regression/ip6/sets.t.payload.inet
index 11dae48..27be86b 100644
--- a/tests/regression/ip6/sets.t.payload.inet
+++ b/tests/regression/ip6/sets.t.payload.inet
@@ -1,5 +1,4 @@
 # ip6 saddr @set2 drop
-set2 test-inet 0
 inet test-inet input 
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
diff --git a/tests/regression/ip6/sets.t.payload.ip6 b/tests/regression/ip6/sets.t.payload.ip6
index 96b57f7..0e51fd3 100644
--- a/tests/regression/ip6/sets.t.payload.ip6
+++ b/tests/regression/ip6/sets.t.payload.ip6
@@ -1,5 +1,4 @@
 # ip6 saddr @set2 drop
-set2 test-ip6 0
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
   [ lookup reg 1 set set2 ]
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH nft 2/2] tests: redirect: fix payload display
  2015-08-18  5:08 [PATCH nft 1/2] tests: sets: don't include listing in payload tests Pablo Neira Ayuso
@ 2015-08-18  5:08 ` Pablo Neira Ayuso
  2015-08-18  8:43   ` Florian Westphal
  0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2015-08-18  5:08 UTC (permalink / raw)
  To: netfilter-devel; +Cc: fw

This has to be related to libnftnl's 0edeb667a2cf ("expr: redir: fix snprintf
to return the number of bytes printed").

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
@Florian: After this patch, I pass all payload tests here that we have :).

 tests/regression/ip/redirect.t.payload      |   36 +++++++++++++--------------
 tests/regression/ip6/redirect.t.payload.ip6 |   30 +++++++++++-----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/regression/ip/redirect.t.payload b/tests/regression/ip/redirect.t.payload
index 3c6e1e0..ac71804 100644
--- a/tests/regression/ip/redirect.t.payload
+++ b/tests/regression/ip/redirect.t.payload
@@ -12,7 +12,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x4 ]
 
 # udp dport 53 redirect random,persistent
 ip test-ip4 output
@@ -20,7 +20,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0xc ]
 
 # udp dport 53 redirect random,persistent,fully-random
 ip test-ip4 output
@@ -28,7 +28,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x1c ]
 
 # udp dport 53 redirect random,fully-random
 ip test-ip4 output
@@ -36,7 +36,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x14 ]
 
 # udp dport 53 redirect random,fully-random,persistent
 ip test-ip4 output
@@ -44,7 +44,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x1c ]
 
 # udp dport 53 redirect persistent
 ip test-ip4 output
@@ -52,7 +52,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x8 ]
 
 # udp dport 53 redirect persistent,random
 ip test-ip4 output
@@ -60,7 +60,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0xc ]
 
 # udp dport 53 redirect persistent,random,fully-random
 ip test-ip4 output
@@ -68,7 +68,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x1c ]
 
 # udp dport 53 redirect persistent,fully-random
 ip test-ip4 output
@@ -76,7 +76,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x18 ]
 
 # udp dport 53 redirect persistent,fully-random,random
 ip test-ip4 output
@@ -84,7 +84,7 @@ ip test-ip4 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x1c ]
 
 # tcp dport 22 redirect to 22
 ip test-ip4 output
@@ -93,7 +93,7 @@ ip test-ip4 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00001600 ]
   [ immediate reg 1 0x00001600 ]
-  [ redir ]
+  [ redir proto_min reg 1 ]
 
 # udp dport 1234 redirect to 4321
 ip test-ip4 output
@@ -102,7 +102,7 @@ ip test-ip4 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000d204 ]
   [ immediate reg 1 0x0000e110 ]
-  [ redir ]
+  [ redir proto_min reg 1 ]
 
 # ip daddr 172.16.0.1 udp dport 9998 redirect to 6515
 ip test-ip4 output
@@ -113,7 +113,7 @@ ip test-ip4 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00000e27 ]
   [ immediate reg 1 0x00007319 ]
-  [ redir ]
+  [ redir proto_min reg 1 ]
 
 # tcp dport 39128 redirect to 993
 ip test-ip4 output
@@ -122,7 +122,7 @@ ip test-ip4 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000d898 ]
   [ immediate reg 1 0x0000e103 ]
-  [ redir ]
+  [ redir proto_min reg 1 ]
 
 # tcp dport 9128 redirect to 993 random
 ip test-ip4 output
@@ -131,7 +131,7 @@ ip test-ip4 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000a823 ]
   [ immediate reg 1 0x0000e103 ]
-  [ redir ]
+  [ redir proto_min reg 1 flags 0x4 ]
 
 # tcp dport 9128 redirect to 993 fully-random
 ip test-ip4 output
@@ -140,7 +140,7 @@ ip test-ip4 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000a823 ]
   [ immediate reg 1 0x0000e103 ]
-  [ redir ]
+  [ redir proto_min reg 1 flags 0x10 ]
 
 # tcp dport 9128 redirect to 123 persistent
 ip test-ip4 output
@@ -149,7 +149,7 @@ ip test-ip4 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000a823 ]
   [ immediate reg 1 0x00007b00 ]
-  [ redir ]
+  [ redir proto_min reg 1 flags 0x8 ]
 
 # tcp dport 9128 redirect to 123 random,persistent
 ip test-ip4 output
@@ -158,7 +158,7 @@ ip test-ip4 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000a823 ]
   [ immediate reg 1 0x00007b00 ]
-  [ redir ]
+  [ redir proto_min reg 1 flags 0xc ]
 
 # tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect
 set%d test-ip4 3
diff --git a/tests/regression/ip6/redirect.t.payload.ip6 b/tests/regression/ip6/redirect.t.payload.ip6
index b05e2c9..3369a7a 100644
--- a/tests/regression/ip6/redirect.t.payload.ip6
+++ b/tests/regression/ip6/redirect.t.payload.ip6
@@ -23,7 +23,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x4 ]
 
 # udp dport 53 redirect random,persistent
 ip6 test-ip6 output
@@ -31,7 +31,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0xc ]
 
 # udp dport 53 redirect random,persistent,fully-random
 ip6 test-ip6 output
@@ -39,7 +39,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x1c ]
 
 # udp dport 53 redirect random,fully-random
 ip6 test-ip6 output
@@ -47,7 +47,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x14 ]
 
 # udp dport 53 redirect random,fully-random,persistent
 ip6 test-ip6 output
@@ -55,7 +55,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x1c ]
 
 # udp dport 53 redirect persistent
 ip6 test-ip6 output
@@ -63,7 +63,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x8 ]
 
 # udp dport 53 redirect persistent,random
 ip6 test-ip6 output
@@ -71,7 +71,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0xc ]
 
 # udp dport 53 redirect persistent,random,fully-random
 ip6 test-ip6 output
@@ -79,7 +79,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x1c ]
 
 # udp dport 53 redirect persistent,fully-random
 ip6 test-ip6 output
@@ -87,7 +87,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x18 ]
 
 # udp dport 53 redirect persistent,fully-random,random
 ip6 test-ip6 output
@@ -95,7 +95,7 @@ ip6 test-ip6 output
   [ cmp eq reg 1 0x00000011 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00003500 ]
-  [ redir ]
+  [ redir flags 0x1c ]
 
 # udp dport 1234 redirect to 1234
 ip6 test-ip6 output
@@ -104,7 +104,7 @@ ip6 test-ip6 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000d204 ]
   [ immediate reg 1 0x0000d204 ]
-  [ redir ]
+  [ redir proto_min reg 1 ]
 
 # ip6 daddr fe00::cafe udp dport 9998 redirect to 6515
 ip6 test-ip6 output
@@ -115,7 +115,7 @@ ip6 test-ip6 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x00000e27 ]
   [ immediate reg 1 0x00007319 ]
-  [ redir ]
+  [ redir proto_min reg 1 ]
 
 # tcp dport 39128 redirect to 993
 ip6 test-ip6 output
@@ -124,7 +124,7 @@ ip6 test-ip6 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000d898 ]
   [ immediate reg 1 0x0000e103 ]
-  [ redir ]
+  [ redir proto_min reg 1 ]
 
 # tcp dport 9128 redirect to 993 random
 ip6 test-ip6 output
@@ -133,7 +133,7 @@ ip6 test-ip6 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000a823 ]
   [ immediate reg 1 0x0000e103 ]
-  [ redir ]
+  [ redir proto_min reg 1 flags 0x4 ]
 
 # tcp dport 9128 redirect to 993 fully-random,persistent
 ip6 test-ip6 output
@@ -142,7 +142,7 @@ ip6 test-ip6 output
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ cmp eq reg 1 0x0000a823 ]
   [ immediate reg 1 0x0000e103 ]
-  [ redir ]
+  [ redir proto_min reg 1 flags 0x18 ]
 
 # tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect
 set%d test-ip6 3
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH nft 2/2] tests: redirect: fix payload display
  2015-08-18  5:08 ` [PATCH nft 2/2] tests: redirect: fix payload display Pablo Neira Ayuso
@ 2015-08-18  8:43   ` Florian Westphal
  0 siblings, 0 replies; 3+ messages in thread
From: Florian Westphal @ 2015-08-18  8:43 UTC (permalink / raw)
  To: Pablo Neira Ayuso; +Cc: netfilter-devel, fw

Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> This has to be related to libnftnl's 0edeb667a2cf ("expr: redir: fix snprintf
> to return the number of bytes printed").
> 
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> @Florian: After this patch, I pass all payload tests here that we have :).

Great.  Please push this :-)

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-08-18  8:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-18  5:08 [PATCH nft 1/2] tests: sets: don't include listing in payload tests Pablo Neira Ayuso
2015-08-18  5:08 ` [PATCH nft 2/2] tests: redirect: fix payload display Pablo Neira Ayuso
2015-08-18  8:43   ` Florian Westphal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).