From 99632dd169d7db6c66abc06df017de83feec2d38 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 31 May 2015 18:20:02 +0200 Subject: tests: regression: fix warnings related to range listing Fix lots of warnings, mostly related to the listing of ranges in many of the tests that we have, eg. any/meta.t: WARNING: line: 30: 'nft add rule ip test-ip4 input meta l4proto 33-45': 'meta l4proto 33-45' mismatches 'meta l4proto 33-45' any/meta.t: WARNING: line: 31: 'nft add rule ip test-ip4 input meta l4proto != 33-45': 'meta l4proto != 33-45' mismatches 'meta l4proto != 33-45' any/meta.t: WARNING: line: 99: 'nft add rule ip test-ip4 input meta skuid 3001-3005 accept': 'meta skuid 3001-3005 accept' mismatches 'skuid 3001-3005 accept' any/meta.t: WARNING: line: 100: 'nft add rule ip test-ip4 input meta skuid != 2001-2005 accept': 'meta skuid != 2001-2005 accept' mismatches 'skuid != 2001-2005 accept' any/meta.t: WARNING: line: 111: 'nft add rule ip test-ip4 input meta skgid 2001-2005 accept': 'meta skgid 2001-2005 accept' mismatches 'skgid 2001-2005 accept' any/meta.t: WARNING: line: 112: 'nft add rule ip test-ip4 input meta skgid != 2001-2005 accept': 'meta skgid != 2001-2005 accept' mismatches 'skgid != 2001-2005 accept' any/meta.t: WARNING: line: 156: 'nft add rule ip test-ip4 input meta cpu 1-3': 'meta cpu 1-3' mismatches 'cpu 1-3' any/meta.t: WARNING: line: 158: 'nft add rule ip test-ip4 input meta cpu != 1-2': 'meta cpu != 1-2' mismatches 'cpu != 1-2' any/meta.t: WARNING: line: 187: 'nft add rule ip test-ip4 input meta cgroup 0x100001 - 0x100003': 'meta cgroup 0x100001 - 0x100003' mismatches 'cgroup 1048577-1048579' ... Signed-off-by: Pablo Neira Ayuso --- tests/regression/ip/icmp.t | 20 ++++++++++---------- tests/regression/ip/ip.t | 38 +++++++++++++++++++------------------- tests/regression/ip/masquerade.t | 2 +- tests/regression/ip/nat.t | 14 +++++++------- tests/regression/ip/redirect.t | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) (limited to 'tests/regression/ip') diff --git a/tests/regression/ip/icmp.t b/tests/regression/ip/icmp.t index cd43a668..9c2aba78 100644 --- a/tests/regression/ip/icmp.t +++ b/tests/regression/ip/icmp.t @@ -24,8 +24,8 @@ icmp type {echo-reply, destination-unreachable, source-quench, redirect, echo-re icmp code 111 accept;ok icmp code != 111 accept;ok -icmp code 33-55;ok;icmp code >= 33 icmp code <= 55 -icmp code != 33-55;ok;icmp code < 33 icmp code > 55 +icmp code 33-55;ok +icmp code != 33-55;ok icmp code { 33-55};ok - icmp code != { 33-55};ok icmp code { 2, 4, 54, 33, 56};ok @@ -36,8 +36,8 @@ icmp code { 2, 4, 54, 33, 56};ok icmp checksum 12343 accept;ok icmp checksum != 12343 accept;ok -icmp checksum 11-343 accept;ok;icmp checksum >= 11 icmp checksum <= 343 accept -icmp checksum != 11-343 accept;ok;icmp checksum < 11 icmp checksum > 343 accept +icmp checksum 11-343 accept;ok +icmp checksum != 11-343 accept;ok icmp checksum { 11-343} accept;ok - icmp checksum != { 11-343} accept;ok icmp checksum { 1111, 222, 343} accept;ok @@ -49,8 +49,8 @@ icmp checksum { 1111, 222, 343} accept;ok icmp id 1245 log;ok icmp id 22;ok icmp id != 233;ok -icmp id 33-45;ok;icmp id >= 33 icmp id <= 45 -icmp id != 33-45;ok;icmp id < 33 icmp id > 45 +icmp id 33-45;ok +icmp id != 33-45;ok icmp id { 33-55};ok - icmp id != { 33-55};ok icmp id { 22, 34, 333};ok @@ -61,8 +61,8 @@ icmp id { 22, 34, 333};ok icmp sequence 22;ok icmp sequence != 233;ok -icmp sequence 33-45;ok;icmp sequence >= 33 icmp sequence <= 45 -icmp sequence != 33-45;ok;icmp sequence < 33 icmp sequence > 45 +icmp sequence 33-45;ok +icmp sequence != 33-45;ok icmp sequence { 33, 55, 67, 88};ok - icmp sequence != { 33, 55, 67, 88};ok icmp sequence { 33-55};ok @@ -83,8 +83,8 @@ icmp mtu { 33-55};ok icmp gateway 22;ok icmp gateway != 233;ok -icmp gateway 33-45;ok;icmp gateway >= 33 icmp gateway <= 45 -icmp gateway != 33-45;ok;icmp gateway < 33 icmp gateway > 45 +icmp gateway 33-45;ok +icmp gateway != 33-45;ok icmp gateway { 33, 55, 67, 88};ok - icmp gateway != { 33, 55, 67, 88};ok icmp gateway { 33-55};ok diff --git a/tests/regression/ip/ip.t b/tests/regression/ip/ip.t index a781de5b..fa864dfd 100644 --- a/tests/regression/ip/ip.t +++ b/tests/regression/ip/ip.t @@ -30,8 +30,8 @@ ip length 232;ok ip length != 233;ok -ip length 333-435;ok;ip length >= 333 ip length <= 435 -ip length != 333-453;ok;ip length < 333 ip length > 453 +ip length 333-435;ok +ip length != 333-453;ok ip length { 333, 553, 673, 838};ok - ip length != { 333, 535, 637, 883};ok ip length { 333-535};ok @@ -39,8 +39,8 @@ ip length { 333-535};ok ip id 22;ok ip id != 233;ok -ip id 33-45;ok;ip id >= 33 ip id <= 45 -ip id != 33-45;ok;ip id < 33 ip id > 45 +ip id 33-45;ok +ip id != 33-45;ok ip id { 33, 55, 67, 88};ok - ip id != { 33, 55, 67, 88};ok ip id { 33-55};ok @@ -48,8 +48,8 @@ ip id { 33-55};ok ip frag-off 222 accept;ok ip frag-off != 233;ok -ip frag-off 33-45;ok;ip frag-off >= 33 ip frag-off <= 45 -ip frag-off != 33-45;ok;ip frag-off < 33 ip frag-off > 45 +ip frag-off 33-45;ok +ip frag-off != 33-45;ok ip frag-off { 33, 55, 67, 88};ok - ip frag-off != { 33, 55, 67, 88};ok ip frag-off { 33-55};ok @@ -57,8 +57,8 @@ ip frag-off { 33-55};ok ip ttl 0 drop;ok ip ttl 233 log;ok -ip ttl 33-55;ok;ip ttl >= 33 ip ttl <= 55 -ip ttl != 45-50;ok;ip ttl < 45 ip ttl > 50 +ip ttl 33-55;ok +ip ttl != 45-50;ok ip ttl {43, 53, 45 };ok - ip ttl != {46, 56, 93 };ok # BUG: ip ttl != {46, 56, 93 };ok @@ -75,8 +75,8 @@ ip protocol { icmp, esp, ah, comp, udp, udplite, tcp, dccp, sctp} accept;ok;ip p ip checksum 13172 drop;ok ip checksum 22;ok ip checksum != 233;ok -ip checksum 33-45;ok;ip checksum >= 33 ip checksum <= 45 -ip checksum != 33-45;ok;ip checksum < 33 ip checksum > 45 +ip checksum 33-45;ok +ip checksum != 33-45;ok ip checksum { 33, 55, 67, 88};ok - ip checksum != { 33, 55, 67, 88};ok ip checksum { 33-55};ok @@ -87,20 +87,20 @@ ip saddr != 192.168.2.0/24;ok ip saddr 192.168.3.1 ip daddr 192.168.3.100;ok ip saddr != 1.1.1.1 log prefix giuseppe;ok;ip saddr != 1.1.1.1 log prefix "giuseppe" ip saddr 1.1.1.1 log prefix example group 1;ok;ip saddr 1.1.1.1 log prefix "example" group 1 -ip daddr 192.168.0.1-192.168.0.250;ok;ip daddr >= 192.168.0.1 ip daddr <= 192.168.0.250 -ip daddr 10.0.0.0-10.255.255.255;ok;ip daddr >= 10.0.0.0 ip daddr <= 10.255.255.255 -ip daddr 172.16.0.0-172.31.255.255;ok;ip daddr >= 172.16.0.0 ip daddr <= 172.31.255.255 -ip daddr 192.168.3.1-192.168.4.250;ok;ip daddr >= 192.168.3.1 ip daddr <= 192.168.4.250 -ip daddr != 192.168.0.1-192.168.0.250;ok;ip daddr < 192.168.0.1 ip daddr > 192.168.0.250 +ip daddr 192.168.0.1-192.168.0.250;ok +ip daddr 10.0.0.0-10.255.255.255;ok +ip daddr 172.16.0.0-172.31.255.255;ok +ip daddr 192.168.3.1-192.168.4.250;ok +ip daddr != 192.168.0.1-192.168.0.250;ok ip daddr { 192.168.0.1-192.168.0.250};ok - ip daddr != { 192.168.0.1-192.168.0.250};ok ip daddr { 192.168.5.1, 192.168.5.2, 192.168.5.3 } accept;ok - ip daddr != { 192.168.5.1, 192.168.5.2, 192.168.5.3 } accept;ok -ip daddr 192.168.1.2-192.168.1.55;ok;ip daddr >= 192.168.1.2 ip daddr <= 192.168.1.55 -ip daddr != 192.168.1.2-192.168.1.55;ok;ip daddr < 192.168.1.2 ip daddr > 192.168.1.55 -ip saddr 192.168.1.3-192.168.33.55;ok;ip saddr >= 192.168.1.3 ip saddr <= 192.168.33.55 -ip saddr != 192.168.1.3-192.168.33.55;ok;ip saddr < 192.168.1.3 ip saddr > 192.168.33.55 +ip daddr 192.168.1.2-192.168.1.55;ok +ip daddr != 192.168.1.2-192.168.1.55;ok +ip saddr 192.168.1.3-192.168.33.55;ok +ip saddr != 192.168.1.3-192.168.33.55;ok ip daddr 192.168.0.1;ok ip daddr 192.168.0.1 drop;ok diff --git a/tests/regression/ip/masquerade.t b/tests/regression/ip/masquerade.t index d0fe02d1..35001f37 100644 --- a/tests/regression/ip/masquerade.t +++ b/tests/regression/ip/masquerade.t @@ -21,5 +21,5 @@ ip saddr 10.1.1.1 masquerade drop;fail # masquerade with sets tcp dport { 1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade;ok -ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter packets 0 bytes 0 masquerade;ok;ip daddr >= 10.0.0.0 ip daddr <= 10.2.3.4 udp dport 53 counter packets 0 bytes 0 masquerade +ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter packets 0 bytes 0 masquerade;ok iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade;ok diff --git a/tests/regression/ip/nat.t b/tests/regression/ip/nat.t index 5afe823a..26c8cbf7 100644 --- a/tests/regression/ip/nat.t +++ b/tests/regression/ip/nat.t @@ -4,15 +4,15 @@ :output;type nat hook output priority 0 -iifname eth0 tcp dport 80-90 dnat 192.168.3.2;ok;iifname "eth0" tcp dport >= 80 tcp dport <= 90 dnat 192.168.3.2 -iifname eth0 tcp dport != 80-90 dnat 192.168.3.2;ok;iifname "eth0" tcp dport < 80 tcp dport > 90 dnat 192.168.3.2 -iifname eth0 tcp dport {80, 90, 23} dnat 192.168.3.2;ok -- iifname eth0 tcp dport != {80, 90, 23} dnat 192.168.3.2;ok +iifname "eth0" tcp dport 80-90 dnat 192.168.3.2;ok +iifname "eth0" tcp dport != 80-90 dnat 192.168.3.2;ok +iifname "eth0" tcp dport {80, 90, 23} dnat 192.168.3.2;ok +- iifname "eth0" tcp dport != {80, 90, 23} dnat 192.168.3.2;ok -iifname eth0 tcp sport 23-34 snat 192.168.3.2;ok;iifname "eth0" tcp sport >= 23 tcp sport <= 34 snat 192.168.3.2 +iifname eth0 tcp sport 23-34 snat 192.168.3.2;ok -- iifname eth0 tcp dport != {80, 90, 23} dnat 192.168.3.2;ok +- iifname "eth0" tcp dport != {80, 90, 23} dnat 192.168.3.2;ok # BUG: invalid expression type set # nft: src/evaluate.c:975: expr_evaluate_relational: Assertion '0' failed. -iifname eth0 tcp dport != 23-34 dnat 192.168.3.2;ok;iifname "eth0" tcp dport < 23 tcp dport > 34 dnat 192.168.3.2 +iifname "eth0" tcp dport != 23-34 dnat 192.168.3.2;ok diff --git a/tests/regression/ip/redirect.t b/tests/regression/ip/redirect.t index bbf440d1..b7eecb74 100644 --- a/tests/regression/ip/redirect.t +++ b/tests/regression/ip/redirect.t @@ -41,5 +41,5 @@ ip saddr 10.1.1.1 redirect drop;fail # redirect with sets tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect;ok -ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter packets 0 bytes 0 redirect;ok;ip daddr >= 10.0.0.0 ip daddr <= 10.2.3.4 udp dport 53 counter packets 0 bytes 0 redirect +ip daddr 10.0.0.0-10.2.3.4 udp dport 53 counter packets 0 bytes 0 redirect;ok iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } redirect;ok -- cgit v1.2.3