Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/ipf Merged IPFilter 5.1.2 into HEAD
details: https://anonhg.NetBSD.org/src/rev/267f787127fb
branches: trunk
changeset: 780384:267f787127fb
user: darrenr <darrenr%NetBSD.org@localhost>
date: Sun Jul 22 14:33:26 2012 +0000
description:
Merged IPFilter 5.1.2 into HEAD
diffstat:
tests/ipf/expected/i12 | 8 ++++----
tests/ipf/expected/i6 | 8 ++++----
tests/ipf/expected/in102 | 4 ++--
tests/ipf/expected/ip1 | 14 +++++++-------
tests/ipf/expected/ip2 | 2 +-
tests/ipf/expected/ip3 | 4 ++--
tests/ipf/expected/n11_6 | 8 ++++----
tests/ipf/expected/n12 | 2 +-
tests/ipf/expected/n12_6 | 2 +-
tests/ipf/expected/n13_6 | 2 +-
tests/ipf/expected/n14 | 2 +-
tests/ipf/expected/n14_6 | 2 +-
tests/ipf/expected/n15 | 2 +-
tests/ipf/expected/n15_6 | 6 +++---
tests/ipf/expected/n18 | 6 +++---
tests/ipf/expected/n1_6 | 10 +++++-----
tests/ipf/expected/n2 | 8 ++++----
tests/ipf/expected/n201 | 28 ----------------------------
tests/ipf/expected/n202 | 23 -----------------------
tests/ipf/expected/n2_6 | 10 +++++-----
tests/ipf/expected/n4 | 4 ++--
tests/ipf/expected/n4_6 | 16 ++++++++--------
tests/ipf/expected/n5 | 6 +++---
tests/ipf/expected/n5_6 | 18 +++++++++---------
tests/ipf/expected/n6 | 6 +++---
tests/ipf/expected/n6_6 | 16 ++++++++--------
tests/ipf/expected/n7_6 | 6 +++---
tests/ipf/expected/n8_6 | 10 +++++-----
tests/ipf/expected/n9_6 | 10 +++++-----
tests/ipf/expected/ni11 | 2 +-
tests/ipf/expected/ni12 | 2 +-
tests/ipf/expected/ni5 | 2 ++
tests/ipf/expected/p3 | 12 ++++++------
tests/ipf/expected/p6 | 2 +-
tests/ipf/input/ipv6.1 | 19 ++++++++++++++++---
tests/ipf/input/n13_6 | 8 ++++----
tests/ipf/input/n14_6 | 8 ++++----
tests/ipf/input/n201 | 24 ------------------------
tests/ipf/input/n202 | 7 -------
tests/ipf/input/n8_6 | 33 ++++++++++++++++++---------------
tests/ipf/input/n9_6 | 8 ++++----
tests/ipf/regress/i18 | 2 +-
tests/ipf/regress/ipv6.5 | 4 ++--
tests/ipf/regress/n13_6 | 2 +-
tests/ipf/regress/n201 | 1 -
tests/ipf/regress/n202 | 1 -
46 files changed, 157 insertions(+), 223 deletions(-)
diffs (truncated from 1141 to 300 lines):
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/i12
--- a/tests/ipf/expected/i12 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/i12 Sun Jul 22 14:33:26 2012 +0000
@@ -30,10 +30,10 @@
pass in inet proto udp from 2.2.2.0/24 to 6.6.6.6/32 port = 9
pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 9
pass in inet from 10.10.10.10/32 to 11.11.11.11/32
-pass in from pool/101(!) to hash/202(!)
-pass in from hash/303(!) to pool/404(!)
+pass in from pool/101 to hash/202
+pass in from hash/303 to pool/404
table role=ipf type=tree number=
- { ! 1.1.1.1/32; 2.2.2.2/32; ! 2.2.0.0/16; };
+ { ! 2.2.0.0/16; 2.2.2.2/32; ! 1.1.1.1/32; };
table role=ipf type=tree number=
{ 1.1.0.0/16; };
-pass in from pool/0(!) to pool/0(!)
+pass in from pool/0 to pool/0
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/i6
--- a/tests/ipf/expected/i6 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/i6 Sun Jul 22 14:33:26 2012 +0000
@@ -1,12 +1,12 @@
pass in on lo0(!) fastroute from any to any
pass in on lo0(!) to qe0(!) inet from 127.0.0.1/32 to 127.0.0.1/32
-pass in on le0(!) to qe0(!):127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
pass in on lo0(!) dup-to qe0(!) inet from 127.0.0.1/32 to 127.0.0.1/32
-pass in on le0(!) dup-to qe0(!):127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
-pass in on le0(!) dup-to qe0(!):127.0.0.1 to hme0(!):10.1.1.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) dup-to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) to hme0:10.1.1.1 dup-to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
block in quick on qe0(!) to qe1(!) from any to any
block in quick to qe1(!) from any to any
pass out quick dup-to hme0(!) from any to any
pass out quick on hme0(!) reply-to hme1(!) from any to any
-pass in on le0(!) dup-to qe0(!):127.0.0.1 reply-to hme1(!):10.10.10.10 inet all
+pass in on le0(!) dup-to qe0:127.0.0.1 reply-to hme1:10.10.10.10 inet all
pass in quick fastroute all
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/in102
--- a/tests/ipf/expected/in102 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/in102 Sun Jul 22 14:33:26 2012 +0000
@@ -1,5 +1,5 @@
rewrite in on bge0 proto tcp from 0/0 to 0/0 -> src 0/0 dst dstlist/a;
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 0/0 -> src 0/0 dst dstlist/bee;
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 0/0 dst dstlist/cat;
-rewrite in on bge0 proto tcp from pool/a(!) to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
-rewrite in on bge0 proto tcp from pool/a(!) to pool/1(!) -> src 0/0 dst dstlist/ant;
+rewrite in on bge0 proto tcp from pool/a to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
+rewrite in on bge0 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant;
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/ip1
--- a/tests/ipf/expected/ip1 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/ip1 Sun Jul 22 14:33:26 2012 +0000
@@ -1,13 +1,13 @@
table role=ipf type=tree number=1
{; };
table role=ipf type=tree number=100
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role=ipf type=tree number=110
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role=ipf type=tree number=120
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role=ipf type=tree number=130
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
+ { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=nat type=tree number=110
+ { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=auth type=tree number=120
+ { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=count type=tree number=130
+ { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
table role=ipf type=hash number=2 size=1
{; };
table role=ipf type=hash number=200 size=5
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/ip2
--- a/tests/ipf/expected/ip2 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/ip2 Sun Jul 22 14:33:26 2012 +0000
@@ -1,2 +1,2 @@
table role=ipf type=tree name=letters
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.1.1.1/32; };
+ { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; };
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/ip3
--- a/tests/ipf/expected/ip3 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/ip3 Sun Jul 22 14:33:26 2012 +0000
@@ -6,8 +6,8 @@
{ 1.1.1.1; bge0:2.2.2.2; };
table role=nat type=hash name=noproxy size=3
{ 1.1.1.1/32; 2.2.2.2/32; };
-table role=ipf type=tree name=raw
- { 2.2.2.2/32; 1.1.1.1/32; };
+table role=nat type=tree name=raw
+ { 1.1.1.1/32; 2.2.2.2/32; };
pool all/dstlist (name jill; policy random;)
{ 1.1.1.1; bge0:2.2.2.2; };
table role=all type=hash name=noproxy size=3
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n11_6
--- a/tests/ipf/expected/n11_6 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n11_6 Sun Jul 22 14:33:26 2012 +0000
@@ -15,7 +15,7 @@
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
List of active MAP/Redirect filters:
-bimap zx0 10:1:1::1/128 -> 1::6:7:8/128
+bimap zx0 inet6 10:1:1::1/128 -> 1::6:7:8/128
List of active sessions:
BIMAP 10:1:1::1 <- -> 1::6:7:8 [10:1:1::2]
@@ -37,7 +37,7 @@
Accounting rules configured (set 1, out)
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2
-17
+16
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
@@ -53,7 +53,7 @@
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
List of active MAP/Redirect filters:
-bimap zx0 10:1:1::/112 -> 10::2:2:2/128
+bimap zx0 inet6 10:1:1::/112 -> 10::2:2:2/128
List of active sessions:
BIMAP 10:1:1:: <- -> 10::2:2:2 [10::2:3:4]
@@ -94,7 +94,7 @@
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:5
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:5
List of active MAP/Redirect filters:
-bimap zx0 10:1:1::/112 -> 10::3:4:0/112
+bimap zx0 inet6 10:1:1::/112 -> 10::3:4:0/112
List of active sessions:
BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::2]
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n12
--- a/tests/ipf/expected/n12 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n12 Sun Jul 22 14:33:26 2012 +0000
@@ -5,7 +5,7 @@
4510 0034 493b 4000 4006 6b69 c0a8 01bc c0a8 0303 2710 0017 4e33 298f f674 e02d 8010 4000 f673 0000 0101 080a 0c72 549e 2c05 b797
List of active MAP/Redirect filters:
-map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000
+map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential
List of active sessions:
MAP 192.168.126.83 4802 <- -> 192.168.1.188 10000 [192.168.3.3 23]
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n12_6
--- a/tests/ipf/expected/n12_6 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n12_6 Sun Jul 22 14:33:26 2012 +0000
@@ -5,7 +5,7 @@
6000 0000 0020 0640 c0a8 0100 0000 0000 0000 0000 0000 00bc c0a8 0300 0000 0000 0000 0000 0000 0003 2710 0017 4e33 298f f674 e02d 8010 4000 f673 0000 0101 080a 0c72 549e 2c05 b797
List of active MAP/Redirect filters:
-map le0 c0a8:7e00::/112 -> ::/128 portmap tcp/udp 10000:20000
+map le0 inet6 c0a8:7e00::/112 -> ::/128 portmap tcp/udp 10000:20000
List of active sessions:
MAP c0a8:7e00::53 4802 <- -> c0a8:100::bc 10000 [c0a8:300::3 23]
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n13_6
--- a/tests/ipf/expected/n13_6 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n13_6 Sun Jul 22 14:33:26 2012 +0000
@@ -3,7 +3,7 @@
> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:24 > 150.1.1.2
> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:25 > 150.1.1.1
List of active MAP/Redirect filters:
-map le0 192.168.0.0/32 -> range 203:0:1::1:23-203:0:1::3:45
+map le0 inet6 192:168:0::0/48 -> range 203:0:1::1:23-203:0:1::3:45
List of active sessions:
MAP 192.168.1.3 <- -> 203:0:1::1:25 [150.1.1.1]
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n14
--- a/tests/ipf/expected/n14 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n14 Sun Jul 22 14:33:26 2012 +0000
@@ -1,7 +1,7 @@
< gre0 ip #0 40(20) 6 10.2.2.5,2000 > 10.1.1.254,80
< gre0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.1.253,80
< gre0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.1.254,80
-16
+15
List of active MAP/Redirect filters:
rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n14_6
--- a/tests/ipf/expected/n14_6 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n14_6 Sun Jul 22 14:33:26 2012 +0000
@@ -3,7 +3,7 @@
< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:7,2000 > 10:1:1:0:0:0:0:254,80
< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:5,2001 > 203:0:1:0:0:0:1:1,80
List of active MAP/Redirect filters:
-rdr gre0 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky
+rdr gre0 inet6 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky
List of active sessions:
RDR 10:1:1::254 80 <- -> 203:0:1::1:1 80 [10::2:2:7 2000]
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n15
--- a/tests/ipf/expected/n15 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n15 Sun Jul 22 14:33:26 2012 +0000
@@ -1,5 +1,5 @@
< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80
-16
+15
List of active MAP/Redirect filters:
rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n15_6
--- a/tests/ipf/expected/n15_6 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n15_6 Sun Jul 22 14:33:26 2012 +0000
@@ -1,7 +1,7 @@
< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80
-18
+16
List of active MAP/Redirect filters:
-rdr le0 any port 80 -> 3:0:3::3:3/128 port 80 tcp
+rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80 tcp
List of active sessions:
RDR 3:0:3::3:3 80 <- -> 5:5::5:5 80 [9:9:9::9 10011]
@@ -24,7 +24,7 @@
< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80
< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,81
List of active MAP/Redirect filters:
-rdr le0 any port 80 -> 3:0:3::3:3/128 port 80-88 tcp
+rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80-88 tcp
List of active sessions:
RDR 3:0:3::3:3 81 <- -> 2::2:2:2 80 [9:9:9::9 10011]
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n18
--- a/tests/ipf/expected/n18 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n18 Sun Jul 22 14:33:26 2012 +0000
@@ -7,7 +7,7 @@
> z0 ip #0 40(20) 6 1.1.1.1,3 > 3.3.3.3,36
> z0 ip #0 40(20) 6 1.1.1.1,4 > 3.3.3.3,37
List of active MAP/Redirect filters:
-map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4 sequential
List of active sessions:
MAP 2.2.2.2 29 <- -> 1.1.1.1 4 [3.3.3.3 37]
@@ -44,7 +44,7 @@
> z0 ip #0 40(20) 6 1.1.1.1,1006 > 3.3.3.3,36
> z0 ip #0 40(20) 6 1.1.1.1,1007 > 3.3.3.3,37
List of active MAP/Redirect filters:
-map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000 sequential
List of active sessions:
MAP 2.2.2.2 29 <- -> 1.1.1.1 1007 [3.3.3.3 37]
@@ -81,7 +81,7 @@
> z0 ip #0 40(20) 6 1.1.1.1,1006 > 3.3.3.3,36
> z0 ip #0 40(20) 6 1.1.1.1,1007 > 3.3.3.3,37
List of active MAP/Redirect filters:
-map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000 sequential
List of active sessions:
MAP 2.2.2.2 29 <- -> 1.1.1.1 1007 [3.3.3.3 37]
diff -r 2e32afb6cd9c -r 267f787127fb tests/ipf/expected/n1_6
--- a/tests/ipf/expected/n1_6 Sun Jul 22 14:32:49 2012 +0000
+++ b/tests/ipf/expected/n1_6 Sun Jul 22 14:33:26 2012 +0000
@@ -33,7 +33,7 @@
> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
List of active MAP/Redirect filters:
-map zx0 10:1:1::1/128 -> 10::2:2:2/128
+map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128
List of active sessions:
MAP 10:1:1::1 <- -> 10::2:2:2 [10:4:3::2]
@@ -57,7 +57,7 @@
Accounting rules configured (set 1, out)
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
-17
+16
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025
@@ -86,12 +86,12 @@
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:1:1:0:0:0:0:2
-17
+16
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
List of active MAP/Redirect filters:
-map zx0 10:1:1::/112 -> 10::3:4:5/128
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128
List of active sessions:
MAP 10:1:1::3 <- -> 10::3:4:5 [10:4:3::4]
@@ -159,7 +159,7 @@
> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:4 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
List of active MAP/Redirect filters:
-map zx0 10:1:1::/112 -> 10::3:4:0/112
+map zx0 inet6 10:1:1::/112 -> 10::3:4:0/112
List of active sessions:
MAP 10:1:1::3 <- -> 10::3:4:4 [10:4:3::4]
Home |
Main Index |
Thread Index |
Old Index