diff options
Diffstat (limited to 'contrib/ipfilter/test/expected')
150 files changed, 0 insertions, 10372 deletions
diff --git a/contrib/ipfilter/test/expected/Makefile b/contrib/ipfilter/test/expected/Makefile deleted file mode 100644 index bb91b8b..0000000 --- a/contrib/ipfilter/test/expected/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# (C)opyright 2007 by Darren Reed. -# -# See the IPFILTER.LICENCE file for details on licencing. -# -all: i19 - -i19: i19.dist Makefile - -if [ "`grep LOG_SECURITY /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - if [ "`grep LOG_AUDIT /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - sed -e 's/security/!!!/g' i19.dist > i19.p1; \ - else \ - sed -e 's/security/audit/g' i19.dist > i19.p1; \ - fi \ - else \ - /bin/cp i19.dist i19.p1; \ - fi - -if [ "`grep LOG_AUTHPRIV /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - sed -e 's/authpriv/!!!/g' i19.p1 > i19.p2; \ - else \ - /bin/cp i19.p1 i19.p2; \ - fi - -if [ "`grep LOG_LOGALERT /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - sed -e 's/logalert/!!!/g' i19.p2 > i19.p1; \ - else \ - /bin/cp i19.p2 i19.p1; \ - fi - -if [ "`grep LOG_FTP /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - sed -e 's/ftp/!!!/g' i19.p1 > i19.p2; \ - else \ - /bin/cp i19.p1 i19.p2; \ - fi - -if [ "`egrep 'LOG_CRON.*15' /usr/include/sys/syslog.h 2>&1`" != "" ] ; then \ - sed -e 's/cron/cron2/g' i19.p2 > i19; \ - else \ - /bin/cp i19.p2 i19; \ - fi - /bin/rm i19.p? - -clean: - /bin/rm -f i19 diff --git a/contrib/ipfilter/test/expected/bpf-f1 b/contrib/ipfilter/test/expected/bpf-f1 deleted file mode 100644 index 85ce84c..0000000 --- a/contrib/ipfilter/test/expected/bpf-f1 +++ /dev/null @@ -1,20 +0,0 @@ -nomatch -pass -nomatch -nomatch --------- -nomatch -nomatch -nomatch -pass --------- -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/bpf1 b/contrib/ipfilter/test/expected/bpf1 deleted file mode 100644 index 76381a7..0000000 --- a/contrib/ipfilter/test/expected/bpf1 +++ /dev/null @@ -1,4 +0,0 @@ -pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "0 0 0 0 0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x1 0x6 0 0 0" } -pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "0 0 0 0 0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x1 0x6 0 0 0" } diff --git a/contrib/ipfilter/test/expected/f1 b/contrib/ipfilter/test/expected/f1 deleted file mode 100644 index 86d9592..0000000 --- a/contrib/ipfilter/test/expected/f1 +++ /dev/null @@ -1,20 +0,0 @@ -block -block -nomatch -nomatch --------- -pass -pass -nomatch -nomatch --------- -nomatch -nomatch -block -block --------- -nomatch -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f10 b/contrib/ipfilter/test/expected/f10 deleted file mode 100644 index da6c312..0000000 --- a/contrib/ipfilter/test/expected/f10 +++ /dev/null @@ -1,126 +0,0 @@ -nomatch -block -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -nomatch -nomatch -pass --------- -block -block -block -nomatch -nomatch -block --------- -pass -pass -pass -nomatch -nomatch -pass --------- -block -block -nomatch -nomatch -nomatch -block --------- -pass -pass -nomatch -nomatch -nomatch -pass --------- -block -block -block -block -block -block --------- -pass -pass -pass -pass -pass -pass --------- -nomatch -block -block -block -nomatch -block --------- -nomatch -pass -pass -pass -nomatch -pass --------- -nomatch -pass -nomatch -nomatch -nomatch -nomatch --------- -nomatch -block -block -block -block -block --------- -nomatch -pass -pass -pass -pass -pass --------- -block -block -nomatch -block -nomatch -block --------- -pass -pass -nomatch -pass -nomatch -pass --------- -block -block -block -block -block -block --------- -pass -pass -pass -pass -pass -pass --------- -block -block -block -nomatch -nomatch -block --------- diff --git a/contrib/ipfilter/test/expected/f11 b/contrib/ipfilter/test/expected/f11 deleted file mode 100644 index d7ab889..0000000 --- a/contrib/ipfilter/test/expected/f11 +++ /dev/null @@ -1,283 +0,0 @@ -pass -nomatch -nomatch -pass -pass -nomatch -pass -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 pass in proto tcp from any to any port = 23 flags S/SA keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -block -nomatch -nomatch -block -block -nomatch -block -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 block in proto tcp from any to any port = 23 flags S/SA keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in proto udp from any to any port = 53 keep frags -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 block in proto udp from any to any port = 53 keep frags -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:udp src:2.2.2.2,2 dst:4.4.4.4,53 240 - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[e1],X[] out X[],X[] - Sync status: not synchronized -4:udp src:1.1.1.1,1 dst:4.4.4.4,53 24 - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[e1],X[e0] out X[],X[] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in proto udp from any to any port = 53 keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:udp src:2.2.2.2,2 dst:4.4.4.4,53 240 - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008401 = block in keep state - interfaces: in X[e1],X[] out X[],X[] - Sync status: not synchronized -4:udp src:1.1.1.1,1 dst:4.4.4.4,53 24 - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - tag 0 pass 0x2008401 = block in keep state - interfaces: in X[e1],X[e0] out X[],X[] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 block in proto udp from any to any port = 53 keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:tcp src:1.1.1.1,1 dst:2.1.2.2,25 state:3/4 864000 - 2:66 4096<<0:16384<<0 - FWD: IN pkts 1 bytes 40 OUT pkts 0 bytes 0 - REV: IN pkts 1 bytes 40 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[e0],X[e1] out X[],X[] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 pass in on e0 proto tcp from any to any port = 25 keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- diff --git a/contrib/ipfilter/test/expected/f12 b/contrib/ipfilter/test/expected/f12 deleted file mode 100644 index 094d8c0..0000000 --- a/contrib/ipfilter/test/expected/f12 +++ /dev/null @@ -1,60 +0,0 @@ -pass -pass -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch --------- -pass -pass -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch --------- -nomatch -nomatch -nomatch -bad-packet -block -nomatch -bad-packet -nomatch -nomatch --------- -nomatch -nomatch -block -bad-packet -block -nomatch -bad-packet -nomatch -nomatch --------- -nomatch -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -pass --------- -nomatch -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -block --------- diff --git a/contrib/ipfilter/test/expected/f13 b/contrib/ipfilter/test/expected/f13 deleted file mode 100644 index ac7947b..0000000 --- a/contrib/ipfilter/test/expected/f13 +++ /dev/null @@ -1,180 +0,0 @@ -pass -bad-packet -nomatch -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -bad-packet -nomatch -block -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -pass -bad-packet -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch --------- -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -block -bad-packet -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch --------- -block -bad-packet -nomatch -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -pass -pass --------- -block -bad-packet -nomatch -block -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -block -block --------- -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -pass -bad-packet -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch --------- -block -bad-packet -nomatch -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -pass -block -block -pass --------- -block -bad-packet -nomatch -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f14 b/contrib/ipfilter/test/expected/f14 deleted file mode 100644 index 1c6ed5c..0000000 --- a/contrib/ipfilter/test/expected/f14 +++ /dev/null @@ -1,48 +0,0 @@ -block -nomatch -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -pass -pass --------- -block -nomatch -nomatch -nomatch -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f15 b/contrib/ipfilter/test/expected/f15 deleted file mode 100644 index 9b31258..0000000 --- a/contrib/ipfilter/test/expected/f15 +++ /dev/null @@ -1,9 +0,0 @@ -block return-rst -pass -block return-icmp -pass -block -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f16 b/contrib/ipfilter/test/expected/f16 deleted file mode 100644 index b6cb3fa..0000000 --- a/contrib/ipfilter/test/expected/f16 +++ /dev/null @@ -1,9 +0,0 @@ -block -block -pass -block -pass -pass -block -block --------- diff --git a/contrib/ipfilter/test/expected/f17 b/contrib/ipfilter/test/expected/f17 deleted file mode 100644 index c586e5b..0000000 --- a/contrib/ipfilter/test/expected/f17 +++ /dev/null @@ -1,7 +0,0 @@ -pass -block return-rst -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f18 b/contrib/ipfilter/test/expected/f18 deleted file mode 100644 index 1af5de5..0000000 --- a/contrib/ipfilter/test/expected/f18 +++ /dev/null @@ -1,27 +0,0 @@ -pass -pass -pass -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in inet from 1.1.1.1/32 to any -Rules configured (set 0, out) -2 pass out inet from 2.2.2.2/32 to any -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -1 count in inet from 1.1.1.1/32 to 3.3.3.3/32 -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -1 count out inet from 2.2.2.2/32 to 4.4.4.4/32 -Accounting rules configured (set 1, out) --------- diff --git a/contrib/ipfilter/test/expected/f19 b/contrib/ipfilter/test/expected/f19 deleted file mode 100644 index 5ee2e9d..0000000 --- a/contrib/ipfilter/test/expected/f19 +++ /dev/null @@ -1,10 +0,0 @@ -pass -pass -pass -nomatch --------- -pass -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f2 b/contrib/ipfilter/test/expected/f2 deleted file mode 100644 index 7093a41..0000000 --- a/contrib/ipfilter/test/expected/f2 +++ /dev/null @@ -1,42 +0,0 @@ -block -block -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -block -nomatch -nomatch --------- -nomatch -nomatch -pass -pass -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -block -block --------- -nomatch -nomatch -nomatch -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f20 b/contrib/ipfilter/test/expected/f20 deleted file mode 100644 index 86308a0..0000000 --- a/contrib/ipfilter/test/expected/f20 +++ /dev/null @@ -1,3 +0,0 @@ -pass -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f21 b/contrib/ipfilter/test/expected/f21 deleted file mode 100644 index 525daca..0000000 --- a/contrib/ipfilter/test/expected/f21 +++ /dev/null @@ -1,5 +0,0 @@ -pass -pass -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f22 b/contrib/ipfilter/test/expected/f22 deleted file mode 100644 index 525daca..0000000 --- a/contrib/ipfilter/test/expected/f22 +++ /dev/null @@ -1,5 +0,0 @@ -pass -pass -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f24 b/contrib/ipfilter/test/expected/f24 deleted file mode 100644 index 801abd3..0000000 --- a/contrib/ipfilter/test/expected/f24 +++ /dev/null @@ -1,5 +0,0 @@ -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f25 b/contrib/ipfilter/test/expected/f25 deleted file mode 100644 index a87b084..0000000 --- a/contrib/ipfilter/test/expected/f25 +++ /dev/null @@ -1,35 +0,0 @@ -pass -pass -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:udp src:192.168.1.235,8008 dst:239.255.255.250,1900 240 - FWD: IN pkts 1 bytes 129 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[hme0],X[] out X[],X[] - Sync status: not synchronized -4:udp src:192.168.1.235,8008 dst:192.168.1.254,1900 24 - FWD: IN pkts 1 bytes 129 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 1 bytes 264 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[hme0],X[] out X[],X[hme0] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in on hme0 proto udp from any to any with mcast keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- diff --git a/contrib/ipfilter/test/expected/f26 b/contrib/ipfilter/test/expected/f26 deleted file mode 100644 index 9e4d62b..0000000 --- a/contrib/ipfilter/test/expected/f26 +++ /dev/null @@ -1,84 +0,0 @@ -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -nomatch -pass -pass -nomatch --------- -pass -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -nomatch -pass -pass -nomatch --------- -pass -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f27 b/contrib/ipfilter/test/expected/f27 deleted file mode 100644 index c62f588..0000000 --- a/contrib/ipfilter/test/expected/f27 +++ /dev/null @@ -1,90 +0,0 @@ -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -nomatch -pass -pass -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -nomatch -pass -pass -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass --------- diff --git a/contrib/ipfilter/test/expected/f28 b/contrib/ipfilter/test/expected/f28 deleted file mode 100644 index e5867e6..0000000 --- a/contrib/ipfilter/test/expected/f28 +++ /dev/null @@ -1,32 +0,0 @@ -block -block -block -> nic0 ip #0 20(20) 0 4.4.3.1 > 4.2.3.2 -pass -> nic1 ip #0 20(20) 0 4.4.1.1 > 4.2.1.2 -pass -> nic2 ip #0 20(20) 0 4.4.2.1 > 4.2.2.2 -pass -> nic3 ip #0 20(20) 0 4.4.3.1 > 4.2.3.2 -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -7 block in all -4 pass in on nic0 to dstlist/spread inet from 4.4.0.0/16 to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/f29 b/contrib/ipfilter/test/expected/f29 deleted file mode 100644 index a650c1b..0000000 --- a/contrib/ipfilter/test/expected/f29 +++ /dev/null @@ -1,64 +0,0 @@ -block -block -block -> nic0 ip #0 28(20) 17 4.4.3.1,1000 > 4.2.3.2,2000 -pass -> nic0 ip #0 28(20) 17 4.4.3.1,1000 > 4.2.3.2,2000 -pass -> nic1 ip #0 28(20) 17 4.4.1.1,1001 > 4.2.1.2,2001 -pass -> nic1 ip #0 28(20) 17 4.4.1.1,1001 > 4.2.1.2,2001 -pass -> nic2 ip #0 28(20) 17 4.4.2.1,1002 > 4.2.2.2,2002 -pass -> nic2 ip #0 28(20) 17 4.4.2.1,1002 > 4.2.2.2,2002 -pass -> nic3 ip #0 28(20) 17 4.4.3.1,1003 > 4.2.3.2,2003 -pass -> nic3 ip #0 28(20) 17 4.4.3.1,1003 > 4.2.3.2,2003 -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:udp src:4.4.3.1,1003 dst:4.2.3.2,2003 240 - FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[nic0],X[] out X[nic3],X[] - Sync status: not synchronized -4:udp src:4.4.2.1,1002 dst:4.2.2.2,2002 240 - FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[nic0],X[] out X[nic2],X[] - Sync status: not synchronized -4:udp src:4.4.1.1,1001 dst:4.2.1.2,2001 240 - FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[nic0],X[] out X[nic1],X[] - Sync status: not synchronized -4:udp src:4.4.3.1,1000 dst:4.2.3.2,2000 240 - FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[nic0],X[] out X[nic0],X[] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -7 block in all -4 pass in on nic0 to dstlist/spread inet from 4.4.0.0/16 to any keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/f3 b/contrib/ipfilter/test/expected/f3 deleted file mode 100644 index 5df3ac4..0000000 --- a/contrib/ipfilter/test/expected/f3 +++ /dev/null @@ -1,48 +0,0 @@ -nomatch -block -nomatch -nomatch -nomatch --------- -nomatch -pass -nomatch -nomatch -nomatch --------- -nomatch -block -block -nomatch -nomatch --------- -nomatch -pass -pass -nomatch -nomatch --------- -nomatch -block -block -block -nomatch --------- -nomatch -pass -pass -pass -nomatch --------- -block -block -block -block -block --------- -pass -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f30 b/contrib/ipfilter/test/expected/f30 deleted file mode 100644 index 30b9d40..0000000 --- a/contrib/ipfilter/test/expected/f30 +++ /dev/null @@ -1,68 +0,0 @@ -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -pass -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f4 b/contrib/ipfilter/test/expected/f4 deleted file mode 100644 index 5df3ac4..0000000 --- a/contrib/ipfilter/test/expected/f4 +++ /dev/null @@ -1,48 +0,0 @@ -nomatch -block -nomatch -nomatch -nomatch --------- -nomatch -pass -nomatch -nomatch -nomatch --------- -nomatch -block -block -nomatch -nomatch --------- -nomatch -pass -pass -nomatch -nomatch --------- -nomatch -block -block -block -nomatch --------- -nomatch -pass -pass -pass -nomatch --------- -block -block -block -block -block --------- -pass -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f5 b/contrib/ipfilter/test/expected/f5 deleted file mode 100644 index 36c7d40..0000000 --- a/contrib/ipfilter/test/expected/f5 +++ /dev/null @@ -1,1392 +0,0 @@ -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block --------- -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block --------- -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block --------- -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f6 b/contrib/ipfilter/test/expected/f6 deleted file mode 100644 index 36c7d40..0000000 --- a/contrib/ipfilter/test/expected/f6 +++ /dev/null @@ -1,1392 +0,0 @@ -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block --------- -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block --------- -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block --------- -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f7 b/contrib/ipfilter/test/expected/f7 deleted file mode 100644 index 7a4daed..0000000 --- a/contrib/ipfilter/test/expected/f7 +++ /dev/null @@ -1,144 +0,0 @@ -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f8 b/contrib/ipfilter/test/expected/f8 deleted file mode 100644 index ad42ff2..0000000 --- a/contrib/ipfilter/test/expected/f8 +++ /dev/null @@ -1,42 +0,0 @@ -block -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -nomatch -block -nomatch -nomatch -nomatch --------- -pass -nomatch -pass -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f9 b/contrib/ipfilter/test/expected/f9 deleted file mode 100644 index cc5be68..0000000 --- a/contrib/ipfilter/test/expected/f9 +++ /dev/null @@ -1,180 +0,0 @@ -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -nomatch --------- diff --git a/contrib/ipfilter/test/expected/i1 b/contrib/ipfilter/test/expected/i1 deleted file mode 100644 index 19ae393..0000000 --- a/contrib/ipfilter/test/expected/i1 +++ /dev/null @@ -1,17 +0,0 @@ -pass in all -block out all -log in all -log body in all -count in from any to any -pass in from !any to any pps 10 -block in from any to !any -pass in on ed0(!) inet from 127.0.0.1/32 to 127.0.0.1/32 -pass in on ed0(!),vx0(!) inet from 127.0.0.1/32 to 127.0.0.1/32 -block in log first on lo0(!) from any to any -pass in log body or-block quick from any to any -block return-rst in quick on le0(!) proto tcp from any to any -block return-icmp in on qe0(!) from any to any -block return-icmp(host-unr) in on qe0(!) from any to any -block return-icmp-as-dest in on le0(!) from any to any -block return-icmp-as-dest(port-unr) in on qe0(!) from any to any -pass out on longNICname0(!) inet from 254.220.186.152/32 to 254.220.186.152/32 diff --git a/contrib/ipfilter/test/expected/i10 b/contrib/ipfilter/test/expected/i10 deleted file mode 100644 index 24137c1..0000000 --- a/contrib/ipfilter/test/expected/i10 +++ /dev/null @@ -1,5 +0,0 @@ -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with opt sec -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with opt lsrr not opt sec -block in inet from any to any with not opt sec-class topsecret -block in inet from any to any with not opt sec-class topsecret,secret -pass in inet from any to any with opt sec-class topsecret,confid not opt sec-class unclass diff --git a/contrib/ipfilter/test/expected/i11 b/contrib/ipfilter/test/expected/i11 deleted file mode 100644 index d1d2cf6..0000000 --- a/contrib/ipfilter/test/expected/i11 +++ /dev/null @@ -1,12 +0,0 @@ -pass in on ed0(!) inet proto tcp from 127.0.0.1/32 to 127.0.0.1/32 port = 23 keep state # count 0 -block in log first on lo0(!) proto tcp/udp from any to any port = 7 keep state # count 0 -pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 20499 keep frags -pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 2049 keep frags (strict) -pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 53 keep state keep frags # count 0 -pass in on ed0(!) out-via vx0(!) proto udp from any to any keep state # count 0 -pass out on ppp0(!) in-via le0(!) proto tcp from any to any keep state # count 0 -pass in on ed0(!),vx0(!) out-via vx0(!),ed0(!) proto udp from any to any keep state # count 0 -pass in inet proto tcp from any port > 1024 to 127.0.0.1/32 port = 1024 keep state # count 0 -pass in proto tcp from any to any flags S/FSRPAU keep state (limit 101,strict,newisn,no-icmp-err,age 600/600) # count 0 -pass in proto tcp from any to any flags S/FSRPAU keep state (limit 101,loose,newisn,no-icmp-err,age 600/600) # count 0 -pass in proto udp from any to any keep state (sync,age 10/20) # count 0 diff --git a/contrib/ipfilter/test/expected/i12 b/contrib/ipfilter/test/expected/i12 deleted file mode 100644 index 6747d93..0000000 --- a/contrib/ipfilter/test/expected/i12 +++ /dev/null @@ -1,39 +0,0 @@ -pass in inet from 1.1.1.1/32 to 2.2.2.2/32 -pass in inet from 2.2.2.0/24 to 4.4.4.4/32 -pass in inet from 3.3.3.3/32 to 4.4.4.4/32 -pass in inet from 2.2.2.0/24 to 5.5.5.5/32 -pass in inet from 3.3.3.3/32 to 5.5.5.5/32 -pass in inet from 2.2.2.0/24 to 6.6.6.6/32 -pass in inet from 3.3.3.3/32 to 6.6.6.6/32 -pass in inet from 2.2.2.0/24 to 5.5.5.5/32 port = 22 -pass in inet from 3.3.3.3/32 to 5.5.5.5/32 port = 22 -pass in inet from 2.2.2.0/24 to 6.6.6.6/32 port = 22 -pass in inet from 3.3.3.3/32 to 6.6.6.6/32 port = 22 -pass in inet from 2.2.2.0/24 to 5.5.5.5/32 port = 25 -pass in inet from 3.3.3.3/32 to 5.5.5.5/32 port = 25 -pass in inet from 2.2.2.0/24 to 6.6.6.6/32 port = 25 -pass in inet from 3.3.3.3/32 to 6.6.6.6/32 port = 25 -pass in inet proto tcp from 2.2.2.0/24 port = 53 to 5.5.5.5/32 -pass in inet proto tcp from 3.3.3.3/32 port = 53 to 5.5.5.5/32 -pass in inet proto tcp from 2.2.2.0/24 port = 9 to 5.5.5.5/32 -pass in inet proto tcp from 3.3.3.3/32 port = 9 to 5.5.5.5/32 -pass in inet proto tcp from 2.2.2.0/24 port = 53 to 6.6.6.6/32 -pass in inet proto tcp from 3.3.3.3/32 port = 53 to 6.6.6.6/32 -pass in inet proto tcp from 2.2.2.0/24 port = 9 to 6.6.6.6/32 -pass in inet proto tcp from 3.3.3.3/32 port = 9 to 6.6.6.6/32 -pass in inet proto udp from 2.2.2.0/24 to 5.5.5.5/32 port = 53 -pass in inet proto udp from 3.3.3.3/32 to 5.5.5.5/32 port = 53 -pass in inet proto udp from 2.2.2.0/24 to 6.6.6.6/32 port = 53 -pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 53 -pass in inet proto udp from 2.2.2.0/24 to 5.5.5.5/32 port = 9 -pass in inet proto udp from 3.3.3.3/32 to 5.5.5.5/32 port = 9 -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 -table role=ipf type=tree number= - { ! 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 diff --git a/contrib/ipfilter/test/expected/i13 b/contrib/ipfilter/test/expected/i13 deleted file mode 100644 index 5c8d945..0000000 --- a/contrib/ipfilter/test/expected/i13 +++ /dev/null @@ -1,2 +0,0 @@ -block in from any to any -pass in from any to any diff --git a/contrib/ipfilter/test/expected/i14 b/contrib/ipfilter/test/expected/i14 deleted file mode 100644 index bccdcac..0000000 --- a/contrib/ipfilter/test/expected/i14 +++ /dev/null @@ -1,12 +0,0 @@ -block in on eri0(!) all head 1 -pass in on eri0(!) proto icmp from any to any group 1 -pass out on ed0(!) all head 1000000 -block out on ed0(!) proto udp from any to any group 1000000 -block in on vm0(!) proto tcp/udp from any to any head 101 -pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group 101 -pass in inet proto tcp from 1.0.0.1/32 to 2.0.0.2/32 group 101 -pass in inet proto udp from 2.0.0.2/32 to 3.0.0.3/32 group 101 -block in on vm0(!) proto tcp/udp from any to any head vm0-group -pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group -block in on vm0(!) proto tcp/udp from any to any head vm0-group -pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group diff --git a/contrib/ipfilter/test/expected/i15 b/contrib/ipfilter/test/expected/i15 deleted file mode 100644 index 4974659..0000000 --- a/contrib/ipfilter/test/expected/i15 +++ /dev/null @@ -1,4 +0,0 @@ -pass out on fxp0(!) all set-tag(log=100) -pass out on fxp0(!) all set-tag(nat=foo) -pass out on fxp0(!) all set-tag(log=100, nat=200) -pass out on fxp0(!) all set-tag(log=2147483648, nat=overtherainbowis) diff --git a/contrib/ipfilter/test/expected/i16 b/contrib/ipfilter/test/expected/i16 deleted file mode 100644 index c5b3cf3..0000000 --- a/contrib/ipfilter/test/expected/i16 +++ /dev/null @@ -1,3 +0,0 @@ -block out all -100 pass in all -10101 pass out proto tcp from any to any diff --git a/contrib/ipfilter/test/expected/i17 b/contrib/ipfilter/test/expected/i17 deleted file mode 100644 index 9e71cb1..0000000 --- a/contrib/ipfilter/test/expected/i17 +++ /dev/null @@ -1,29 +0,0 @@ -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -0 pass in inet from 1.1.1.1/32 to any -0 pass in all -0 pass in inet from 3.3.3.3/32 to any -0 pass in inet from any to 127.0.0.1/32 -0 pass in inet from 127.0.0.1/32 to any -0 100 pass in inet from 127.0.0.1/32 to any -0 100 pass in all -0 110 pass in proto udp from any to any -0 110 pass in inet from 2.2.2.2/32 to any -0 110 pass in inet from 127.0.0.1/32 to any -0 200 pass in proto tcp from any to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) diff --git a/contrib/ipfilter/test/expected/i18 b/contrib/ipfilter/test/expected/i18 deleted file mode 100644 index 2c7e493..0000000 --- a/contrib/ipfilter/test/expected/i18 +++ /dev/null @@ -1,11 +0,0 @@ -pass in tos 0x50 from any to any -pass in tos 0x80 from any to any -pass out tos 0x80 from any to any -pass out tos 0x50 from any to any -block in ttl 0 from any to any -block in ttl 1 from any to any -block in ttl 2 from any to any -block in ttl 3 from any to any -block in ttl 4 from any to any -block in ttl 5 from any to any -block in ttl 6 from any to any diff --git a/contrib/ipfilter/test/expected/i19 b/contrib/ipfilter/test/expected/i19 deleted file mode 100644 index 4ca19b5..0000000 --- a/contrib/ipfilter/test/expected/i19 +++ /dev/null @@ -1,22 +0,0 @@ -block in log level user.debug quick proto icmp from any to any -block in log level mail.info quick proto icmp from any to any -block in log level daemon.notice quick proto icmp from any to any -block in log level auth.warn quick proto icmp from any to any -block in log level syslog.err quick proto icmp from any to any -block in log level lpr.crit quick proto icmp from any to any -block in log level news.alert quick proto icmp from any to any -block in log level uucp.emerg quick proto icmp from any to any -block in log level cron.debug quick proto icmp from any to any -block in log level ftp.info quick proto icmp from any to any -block in log level authpriv.notice quick proto icmp from any to any -block in log level !!!.warn quick proto icmp from any to any -block in log level local0.err quick proto icmp from any to any -block in log level local1.crit quick proto icmp from any to any -block in log level local2.alert quick proto icmp from any to any -block in log level local3.emerg quick proto icmp from any to any -block in log level local4.debug quick proto icmp from any to any -block in log level local5.info quick proto icmp from any to any -block in log level local6.notice quick proto icmp from any to any -block in log level local7.warn quick proto icmp from any to any -block in log level kern.err quick proto icmp from any to any -block in log level !!!.emerg quick proto icmp from any to any diff --git a/contrib/ipfilter/test/expected/i19.dist b/contrib/ipfilter/test/expected/i19.dist deleted file mode 100644 index 5d9c26c..0000000 --- a/contrib/ipfilter/test/expected/i19.dist +++ /dev/null @@ -1,22 +0,0 @@ -block in log level user.debug quick proto icmp from any to any -block in log level mail.info quick proto icmp from any to any -block in log level daemon.notice quick proto icmp from any to any -block in log level auth.warn quick proto icmp from any to any -block in log level syslog.err quick proto icmp from any to any -block in log level lpr.crit quick proto icmp from any to any -block in log level news.alert quick proto icmp from any to any -block in log level uucp.emerg quick proto icmp from any to any -block in log level cron.debug quick proto icmp from any to any -block in log level ftp.info quick proto icmp from any to any -block in log level authpriv.notice quick proto icmp from any to any -block in log level logalert.warn quick proto icmp from any to any -block in log level local0.err quick proto icmp from any to any -block in log level local1.crit quick proto icmp from any to any -block in log level local2.alert quick proto icmp from any to any -block in log level local3.emerg quick proto icmp from any to any -block in log level local4.debug quick proto icmp from any to any -block in log level local5.info quick proto icmp from any to any -block in log level local6.notice quick proto icmp from any to any -block in log level local7.warn quick proto icmp from any to any -block in log level kern.err quick proto icmp from any to any -block in log level security.emerg quick proto icmp from any to any diff --git a/contrib/ipfilter/test/expected/i2 b/contrib/ipfilter/test/expected/i2 deleted file mode 100644 index 17b9d07..0000000 --- a/contrib/ipfilter/test/expected/i2 +++ /dev/null @@ -1,9 +0,0 @@ -log in proto tcp from any to any -pass in proto tcp from any to any -pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 -block in proto ipv6 from any to any -block in proto udp from any to any -block in proto 250 from any to any -pass in proto tcp/udp from any to any -block in proto tcp/udp from any to any -block in proto tcp/udp from any to any diff --git a/contrib/ipfilter/test/expected/i20 b/contrib/ipfilter/test/expected/i20 deleted file mode 100644 index 25e35cd..0000000 --- a/contrib/ipfilter/test/expected/i20 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on ppp0(!) inet from ppp0/peer to ppp0/32 -block in on hme0(!) inet from any to hme0/bcast -pass in on bge0(!) inet from bge0/net to bge0/32 -block in on eri0(!) inet from any to eri0/netmasked diff --git a/contrib/ipfilter/test/expected/i21 b/contrib/ipfilter/test/expected/i21 deleted file mode 100644 index d4d28da..0000000 --- a/contrib/ipfilter/test/expected/i21 +++ /dev/null @@ -1,16 +0,0 @@ -pass in from any port = 10101 to any -pass out from any to any port != 22 -block in from any port 20:21 to any -block out from any to any port 10 <> 100 -pass out from any to any port = 3 -pass out from any to any port = 5 -pass out from any to any port = 7 -pass out from any to any port = 9 -block in from any port = 20 to any -block in from any port = 25 to any -pass in from any port 11:12 to any port 1:2 -pass in from any port 21:22 to any port 1:2 -pass in from any port 11:12 to any port 4:5 -pass in from any port 21:22 to any port 4:5 -pass in from any port 11:12 to any port 8:9 -pass in from any port 21:22 to any port 8:9 diff --git a/contrib/ipfilter/test/expected/i22 b/contrib/ipfilter/test/expected/i22 deleted file mode 100644 index 6e5a07d..0000000 --- a/contrib/ipfilter/test/expected/i22 +++ /dev/null @@ -1,5 +0,0 @@ -pass in exp { "ip.src != 1.1.1.0/24; tcp.dport = 80;" } -pass in exp { "ip.addr = 1.2.3.4/32,5.6.7.8/32;" } -block out exp { "ip.dst = 127.0.0.0/8;" } -block in exp { "udp.sport = 53; udp.dport = 53;" } -pass out exp { "tcp.sport = 22; tcp.port = 25;" } diff --git a/contrib/ipfilter/test/expected/i23 b/contrib/ipfilter/test/expected/i23 deleted file mode 100644 index e69de29..0000000 --- a/contrib/ipfilter/test/expected/i23 +++ /dev/null diff --git a/contrib/ipfilter/test/expected/i3 b/contrib/ipfilter/test/expected/i3 deleted file mode 100644 index 691ad25..0000000 --- a/contrib/ipfilter/test/expected/i3 +++ /dev/null @@ -1,11 +0,0 @@ -log in all -pass in inet from 128.16.0.0/16 to 129.10.10.0/24 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 -block in log inet from any to any -block in log level auth.info on hme0(!) all -log level local5.warn out all diff --git a/contrib/ipfilter/test/expected/i4 b/contrib/ipfilter/test/expected/i4 deleted file mode 100644 index 1198714..0000000 --- a/contrib/ipfilter/test/expected/i4 +++ /dev/null @@ -1,9 +0,0 @@ -log in proto tcp from any port > 0 to any -log in proto tcp from any to any port > 0 -pass in proto tcp from any port != 0 to any port 0 >< 65535 -pass in inet proto udp from 127.0.0.1/32 port > 32000 to 127.0.0.1/32 port < 29000 -block in proto udp from any port != 123 to any port < 7 -block in proto tcp from any port = 25 to any port > 25 -pass in proto tcp/udp from any port 1 >< 3 to any port 1 <> 3 -pass in proto tcp/udp from any port 2:2 to any port 10:20 -pass in log first quick proto tcp from any port > 1023 to any port = 1723 flags S/FSRPAU keep state # count 0 diff --git a/contrib/ipfilter/test/expected/i5 b/contrib/ipfilter/test/expected/i5 deleted file mode 100644 index 0dbc859..0000000 --- a/contrib/ipfilter/test/expected/i5 +++ /dev/null @@ -1,9 +0,0 @@ -log in all -count in tos 0x80 from any to any -pass in on ed0(!) inet tos 0x40 from 127.0.0.1/32 to 127.0.0.1/32 -block in log on lo0(!) ttl 0 from any to any -pass in quick ttl 1 from any to any -skip 3 out inet from 127.0.0.1/32 to any -auth out on foo0(!) proto tcp from any to any port = 80 -preauth out on foo0(!) proto tcp from any to any port = 22 -nomatch out on foo0(!) proto tcp from any port < 1024 to any diff --git a/contrib/ipfilter/test/expected/i6 b/contrib/ipfilter/test/expected/i6 deleted file mode 100644 index 29c33a2..0000000 --- a/contrib/ipfilter/test/expected/i6 +++ /dev/null @@ -1,12 +0,0 @@ -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 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(!) 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 quick fastroute all diff --git a/contrib/ipfilter/test/expected/i7 b/contrib/ipfilter/test/expected/i7 deleted file mode 100644 index 552f7f8..0000000 --- a/contrib/ipfilter/test/expected/i7 +++ /dev/null @@ -1,14 +0,0 @@ -pass in on ed0(!) inet proto tcp from 127.0.0.1/32 to 127.0.0.1/32 port = 23 flags S/SA -block in on lo0(!) proto tcp from any to any flags A/FSRPAU -pass in on lo0(!) proto tcp from any to any flags /SPA -block in on lo0(!) proto tcp from any to any flags C/A -pass in on lo0(!) proto tcp from any to any flags S/SA -block in on lo0(!) proto tcp from any to any flags S/SA -pass in on lo0(!) proto tcp from any to any flags S/FSRPAU -block in on lo0(!) proto tcp from any to any flags /A -pass in on lo0(!) proto tcp from any to any flags S/SA -pass in on lo0(!) proto tcp from any to any flags S/SA -block in on lo0(!) proto tcp from any to any flags S/SA -pass in on lo0(!) proto tcp from any to any flags S/FSRPAU -block in on lo0(!) proto tcp from any to any flags /A -pass in on lo0(!) proto tcp from any to any flags S/SA diff --git a/contrib/ipfilter/test/expected/i8 b/contrib/ipfilter/test/expected/i8 deleted file mode 100644 index a85f1de..0000000 --- a/contrib/ipfilter/test/expected/i8 +++ /dev/null @@ -1,66 +0,0 @@ -pass in inet proto icmp from 127.0.0.1/32 to 127.0.0.1/32 icmp-type timest -block in inet proto icmp from any to any icmp-type unreach code 1 -pass in inet proto icmp from any to any icmp-type unreach code 15 -pass in inet proto icmp from any to any icmp-type unreach code 13 -pass in inet proto icmp from any to any icmp-type unreach code 8 -pass in inet proto icmp from any to any icmp-type unreach code 4 -pass in inet proto icmp from any to any icmp-type unreach code 9 -pass in inet proto icmp from any to any icmp-type unreach code 11 -pass in inet proto icmp from any to any icmp-type unreach code 14 -pass in inet proto icmp from any to any icmp-type unreach code 10 -pass in inet proto icmp from any to any icmp-type unreach code 12 -pass in inet proto icmp from any to any icmp-type unreach code 7 -pass in inet proto icmp from any to any icmp-type unreach code 1 -pass in inet proto icmp from any to any icmp-type unreach code 6 -pass in inet proto icmp from any to any icmp-type unreach code 0 -pass in inet proto icmp from any to any icmp-type unreach code 3 -pass in inet proto icmp from any to any icmp-type unreach code 2 -pass in inet proto icmp from any to any icmp-type unreach code 5 -pass in inet proto icmp from any to any icmp-type echo -pass in inet proto icmp from any to any icmp-type echorep -pass in inet proto icmp from any to any icmp-type inforeq -pass in inet proto icmp from any to any icmp-type inforep -pass in inet proto icmp from any to any icmp-type maskrep -pass in inet proto icmp from any to any icmp-type maskreq -pass in inet proto icmp from any to any icmp-type paramprob -pass in inet proto icmp from any to any icmp-type redir -pass in inet proto icmp from any to any icmp-type unreach -pass in inet proto icmp from any to any icmp-type routerad -pass in inet proto icmp from any to any icmp-type routersol -pass in inet proto icmp from any to any icmp-type squench -pass in inet proto icmp from any to any icmp-type timest -pass in inet proto icmp from any to any icmp-type timestrep -pass in inet proto icmp from any to any icmp-type timex -pass in inet proto icmp from any to any icmp-type 254 -pass in inet proto icmp from any to any icmp-type 253 code 254 -pass in inet proto icmp from any to any icmp-type unreach code 15 -pass in inet proto icmp from any to any icmp-type unreach code 13 -pass in inet proto icmp from any to any icmp-type unreach code 8 -pass in inet proto icmp from any to any icmp-type unreach code 4 -pass in inet proto icmp from any to any icmp-type unreach code 9 -pass in inet proto icmp from any to any icmp-type unreach code 11 -pass in inet proto icmp from any to any icmp-type unreach code 14 -pass in inet proto icmp from any to any icmp-type unreach code 10 -pass in inet proto icmp from any to any icmp-type unreach code 12 -pass in inet proto icmp from any to any icmp-type unreach code 7 -pass in inet proto icmp from any to any icmp-type unreach code 1 -pass in inet proto icmp from any to any icmp-type unreach code 6 -pass in inet proto icmp from any to any icmp-type unreach code 0 -pass in inet proto icmp from any to any icmp-type unreach code 3 -pass in inet proto icmp from any to any icmp-type unreach code 2 -pass in inet proto icmp from any to any icmp-type unreach code 5 -pass in inet proto icmp from any to any icmp-type echo -pass in inet proto icmp from any to any icmp-type echorep -pass in inet proto icmp from any to any icmp-type inforeq -pass in inet proto icmp from any to any icmp-type inforep -pass in inet proto icmp from any to any icmp-type maskrep -pass in inet proto icmp from any to any icmp-type maskreq -pass in inet proto icmp from any to any icmp-type paramprob -pass in inet proto icmp from any to any icmp-type redir -pass in inet proto icmp from any to any icmp-type unreach -pass in inet proto icmp from any to any icmp-type routerad -pass in inet proto icmp from any to any icmp-type routersol -pass in inet proto icmp from any to any icmp-type squench -pass in inet proto icmp from any to any icmp-type timest -pass in inet proto icmp from any to any icmp-type timestrep -pass in inet proto icmp from any to any icmp-type timex diff --git a/contrib/ipfilter/test/expected/i9 b/contrib/ipfilter/test/expected/i9 deleted file mode 100644 index deecd17..0000000 --- a/contrib/ipfilter/test/expected/i9 +++ /dev/null @@ -1,17 +0,0 @@ -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with short,frag -block in from any to any with ipopts -pass in inet from any to any with opt nop,rr,zsu -pass in inet from any to any with opt nop,rr,zsu not opt lsrr,ssrr -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with not frag -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with frag,frag-body -pass in proto tcp from any to any flags S/FSRPAU with not oow keep state # count 0 -block in proto tcp from any to any with oow -pass in proto tcp from any to any flags S/FSRPAU with not bad,bad-src,bad-nat -block in proto tcp from any to any flags S/FSRPAU with bad,not bad-src,not bad-nat -pass in quick from any to any with not short -block in quick from any to any with not nat -pass in quick from any to any with not frag-body -block in quick from any to any with not lowttl -pass in from any to any with not ipopts,mbcast,not bcast,mcast,not state -block in from any to any with not mbcast,bcast,not mcast,state -pass in inet from any to any with opt mtup,mtur,encode,ts,tr,sec,e-sec,cipso,satid,ssrr,addext,visa,imitd,eip,finn,dps,sdb,nsapa,rtralrt,ump diff --git a/contrib/ipfilter/test/expected/in1 b/contrib/ipfilter/test/expected/in1 deleted file mode 100644 index 2f1cf31..0000000 --- a/contrib/ipfilter/test/expected/in1 +++ /dev/null @@ -1,31 +0,0 @@ -map le0 0/0 -> 0/32 -map le0 0.0.0.1/32 -> 0.0.0.1/32 -map le0 128.0.0.0/1 -> 0/0 -map le0 10.0.0.0/8 -> 1.2.3.0/24 -map le0 10.0.0.0/8 -> 1.2.3.0/24 -map le0 10.0.0.0/8 -> 1.2.3.0/24 -map le0 0.0.0.5/0.0.0.255 -> 1.2.3.0/24 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 -map ppp0 192.168.0.0/16 -> 0/32 portmap udp 20000:29999 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp 30000:39999 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp auto -map ppp0 192.168.0.0/16 -> 0/32 portmap udp auto -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp auto -map ppp0 192.168.0.0/16 -> 0/32 proxy port 21 ftp/tcp -map ppp0 192.168.0.0/16 -> 0/32 proxy port 1010 ftp/tcp -map le0 0/0 -> 0/32 frag -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag -map ppp0 192.168.0.0/16 -> 0/32 proxy port 21 ftp/tcp frag -map le0 0/0 -> 0/32 age 10/10 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 age 10/20 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 age 30/30 -map le0 0/0 -> 0/32 frag age 10/10 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag age 10/20 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag age 30/30 -map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp -map thisisalonginte 0/0 -> 0/32 mssclamp 1452 tag freddyliveshere -map bar0 0/0 -> 0/32 icmpidmap icmp 1000:2000 -map ppp0,adsl0 0/0 -> 0/32 -map ppp0 from 192.168.0.0/16 to 0/0 port = 123 -> 0/32 age 30/1 udp diff --git a/contrib/ipfilter/test/expected/in100 b/contrib/ipfilter/test/expected/in100 deleted file mode 100644 index dcf3097..0000000 --- a/contrib/ipfilter/test/expected/in100 +++ /dev/null @@ -1,3 +0,0 @@ -rewrite in on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32; -rewrite out on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.4/32; -rewrite in on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.0/24; diff --git a/contrib/ipfilter/test/expected/in101 b/contrib/ipfilter/test/expected/in101 deleted file mode 100644 index 04e234c..0000000 --- a/contrib/ipfilter/test/expected/in101 +++ /dev/null @@ -1,4 +0,0 @@ -rewrite in on bge0 proto icmp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32; -rewrite in on bge0 proto udp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32; -rewrite out on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.4/32; -rewrite in on bge0 proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24,20202 dst 4.4.4.0/24,10101; diff --git a/contrib/ipfilter/test/expected/in102 b/contrib/ipfilter/test/expected/in102 deleted file mode 100644 index 0a1b612..0000000 --- a/contrib/ipfilter/test/expected/in102 +++ /dev/null @@ -1,5 +0,0 @@ -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; diff --git a/contrib/ipfilter/test/expected/in2 b/contrib/ipfilter/test/expected/in2 deleted file mode 100644 index dc8f4ac..0000000 --- a/contrib/ipfilter/test/expected/in2 +++ /dev/null @@ -1,71 +0,0 @@ -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 255 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip -rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip -rdr le0 9.8.0.0/16 -> 1.1.1.1/32 ip -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 0/0 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 udp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp/udp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp/udp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 tag nattagcacheline -rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1/32 port 21 tcp proxy ftp -rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1/32 port 21 tcp proxy ftp -rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port 5555 tcp -rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port = 5555 tcp -rdr le0 0/0 -> 254.220.186.152/32 ip -rdr le0 0/0 -> 254.220.186.152,254.220.186.152 ip -rdr adsl0,ppp0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port 5555-7777 tcp diff --git a/contrib/ipfilter/test/expected/in3 b/contrib/ipfilter/test/expected/in3 deleted file mode 100644 index dac97c7..0000000 --- a/contrib/ipfilter/test/expected/in3 +++ /dev/null @@ -1,5 +0,0 @@ -bimap le0 0/0 -> 0/32 -bimap le0 0.0.0.1/32 -> 0.0.0.1/32 -bimap le0 128.0.0.0/1 -> 0/0 -bimap le0 10.0.0.0/8 -> 1.2.3.0/24 -bimap le0 10.0.5.0/24 -> 1.2.3.0/24 diff --git a/contrib/ipfilter/test/expected/in4 b/contrib/ipfilter/test/expected/in4 deleted file mode 100644 index ac8dce1..0000000 --- a/contrib/ipfilter/test/expected/in4 +++ /dev/null @@ -1,5 +0,0 @@ -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 256 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports auto -map-block le0 10.0.0.0/16 -> 203.1.1.0/24 ports auto diff --git a/contrib/ipfilter/test/expected/in5 b/contrib/ipfilter/test/expected/in5 deleted file mode 100644 index b7c6ef5..0000000 --- a/contrib/ipfilter/test/expected/in5 +++ /dev/null @@ -1,24 +0,0 @@ -map le0 from 9.8.7.6/32 port > 1024 to 0/0 -> 1.1.1.1/32 portmap tcp 10000:20000 -map le0 from 9.8.7.6/32 port > 1024 ! to 1.2.3.4/32 -> 1.1.1.1/32 portmap tcp 10000:20000 -rdr le0 from 0/0 to 9.8.7.6/32 port = 0 -> 1.1.1.1/32 port 0 tcp -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip -rdr le0 ! from 1.2.3.4/32 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 udp -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp/udp -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp frag -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin frag -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag age 20/20 -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin frag age 30/30 -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag age 40/40 diff --git a/contrib/ipfilter/test/expected/in6 b/contrib/ipfilter/test/expected/in6 deleted file mode 100644 index fefc052..0000000 --- a/contrib/ipfilter/test/expected/in6 +++ /dev/null @@ -1,8 +0,0 @@ -map foo0 from 0/0 port = 1 to 0/0 port != 0 -> 0/32 udp -map foo0 from 0/0 port = 1 to 0/0 port != 0 -> 0/32 udp -map foo0 from 0/0 port < 1 to 0/0 port > 0 -> 0/32 tcp -map foo0 from 0/0 port < 1 to 0/0 port > 0 -> 0/32 tcp -map foo0 from 0/0 port <= 1 to 0/0 port >= 0 -> 0/32 tcp/udp -map foo0 from 0/0 port <= 1 to 0/0 port >= 0 -> 0/32 tcp/udp -map foo0 from 0/0 port 1 >< 20 to 0/0 port 20 <> 40 -> 0/32 tcp/udp -map foo0 from 0/0 port 10:20 to 0/0 port 30:40 -> 0/32 tcp/udp diff --git a/contrib/ipfilter/test/expected/in7 b/contrib/ipfilter/test/expected/in7 deleted file mode 100644 index e69de29..0000000 --- a/contrib/ipfilter/test/expected/in7 +++ /dev/null diff --git a/contrib/ipfilter/test/expected/ip1 b/contrib/ipfilter/test/expected/ip1 deleted file mode 100644 index cee7831..0000000 --- a/contrib/ipfilter/test/expected/ip1 +++ /dev/null @@ -1,68 +0,0 @@ -table role=ipf type=tree number=1 - {; }; -table role=ipf type=tree number=100 - { 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 - { 0/0; 1/32; 1.2.3.4/32; }; -table role=nat type=hash number=210 size=5 - { 0/0; 2/32; 1.2.3.4/32; }; -table role=auth type=hash number=220 size=5 - { 0/0; 3/32; 1.2.3.4/32; }; -table role=count type=hash number=230 size=5 - { 0/0; 4/32; 1.2.3.4/32; }; -table role=ipf type=hash number=240 size=5 seed=101 - { 0/0; 1/32; 1.2.3.4/32; }; -table role=nat type=hash number=250 size=5 seed=101 - { 0/0; 2/32; 1.2.3.4/32; }; -table role=auth type=hash number=260 size=5 seed=101 - { 0/0; 3/32; 1.2.3.4/32; }; -table role=count type=hash number=270 size=5 seed=101 - { 0/0; 4/32; 1.2.3.4/32; }; -table role=ipf type=hash number=2000 size=1001 - { 0/0; 1/32; 1.2.3.4/32; }; -table role=nat type=hash number=2000 size=1001 - { 0/0; 2/32; 1.2.3.4/32; }; -table role=auth type=hash number=2000 size=1001 - { 0/0; 3/32; 1.2.3.4/32; }; -table role=count type=hash number=2000 size=1001 - { 0/0; 4/32; 1.2.3.4/32; }; -table role=ipf type=hash number=100 size=1001 seed=101 - { 0/0; 1/32; 1.2.3.4/32; }; -table role=nat type=hash number=100 size=1001 seed=101 - { 0/0; 2/32; 1.2.3.4/32; }; -table role=auth type=hash number=100 size=1001 seed=101 - { 0/0; 3/32; 1.2.3.4/32; }; -table role=count type=hash number=100 size=1001 seed=101 - { 0/0; 4/32; 1.2.3.4/32; }; -group-map in role=ipf number=300 size=5 - { 0/0, group=303; 5/32, group=303; 1.2.3.4/32, group=303; }; -group-map in role=nat number=300 size=5 - { 0/0, group=303; 6/32, group=303; 1.2.3.4/32, group=303; }; -group-map in role=auth number=300 size=5 - { 0/0, group=303; 7/32, group=303; 1.2.3.4/32, group=303; }; -group-map in role=count number=300 size=5 - { 0/0, group=303; 8/32, group=303; 1.2.3.4/32, group=303; }; -group-map out role=ipf number=400 size=5 - { 0/0, group=303; 5/32, group=303; 1.2.3.4/32, group=606; }; -group-map out role=nat number=400 size=5 - { 0/0, group=303; 6/32, group=303; 1.2.3.4/32, group=606; }; -group-map out role=auth number=400 size=5 - { 0/0, group=303; 7/32, group=303; 1.2.3.4/32, group=606; }; -group-map out role=count number=400 size=5 - { 0/0, group=303; 8/32, group=303; 1.2.3.4/32, group=606; }; -group-map in role=ipf number=500 size=5 - { 0/0, group=10; 5/32, group=800; 1.2.3.4/32, group=606; }; -group-map in role=nat number=500 size=5 - { 0/0, group=10; 6/32, group=800; 1.2.3.4/32, group=606; }; -group-map in role=auth number=500 size=5 - { 0/0, group=10; 7/32, group=800; 1.2.3.4/32, group=606; }; -group-map in role=count number=500 size=5 - { 0/0, group=10; 8/32, group=800; 1.2.3.4/32, group=606; }; diff --git a/contrib/ipfilter/test/expected/ip2 b/contrib/ipfilter/test/expected/ip2 deleted file mode 100644 index 3de3c47..0000000 --- a/contrib/ipfilter/test/expected/ip2 +++ /dev/null @@ -1,2 +0,0 @@ -table role=ipf type=tree name=letters - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; }; diff --git a/contrib/ipfilter/test/expected/ip3 b/contrib/ipfilter/test/expected/ip3 deleted file mode 100644 index 48dd074..0000000 --- a/contrib/ipfilter/test/expected/ip3 +++ /dev/null @@ -1,14 +0,0 @@ -pool ipf/dstlist (name fred; policy round-robin;) - { 3.3.3.3; }; -pool ipf/dstlist (name jack; policy weighting connection;) - { 4.4.4.4; bge0:5.5.5.5; }; -pool ipf/dstlist (name jill; policy random;) - { 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=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 - { 1.1.1.1/32; 2.2.2.2/32; }; diff --git a/contrib/ipfilter/test/expected/ipv6.1 b/contrib/ipfilter/test/expected/ipv6.1 deleted file mode 100644 index 9fd5437..0000000 --- a/contrib/ipfilter/test/expected/ipv6.1 +++ /dev/null @@ -1,4 +0,0 @@ -pass -pass -nomatch --------- diff --git a/contrib/ipfilter/test/expected/ipv6.2 b/contrib/ipfilter/test/expected/ipv6.2 deleted file mode 100644 index ba1581b..0000000 --- a/contrib/ipfilter/test/expected/ipv6.2 +++ /dev/null @@ -1,15 +0,0 @@ -nomatch -block -nomatch -block --------- -block -nomatch -block -nomatch --------- -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/ipv6.3 b/contrib/ipfilter/test/expected/ipv6.3 deleted file mode 100644 index 58cddec..0000000 --- a/contrib/ipfilter/test/expected/ipv6.3 +++ /dev/null @@ -1,6 +0,0 @@ -pass -nomatch -nomatch -nomatch -pass --------- diff --git a/contrib/ipfilter/test/expected/ipv6.4 b/contrib/ipfilter/test/expected/ipv6.4 deleted file mode 100644 index e3ae842..0000000 --- a/contrib/ipfilter/test/expected/ipv6.4 +++ /dev/null @@ -1,51 +0,0 @@ -pass -pass -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -block -nomatch -nomatch -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/ipv6.5 b/contrib/ipfilter/test/expected/ipv6.5 deleted file mode 100644 index 3133a7f..0000000 --- a/contrib/ipfilter/test/expected/ipv6.5 +++ /dev/null @@ -1,6 +0,0 @@ -pass -nomatch --------- -block -nomatch --------- diff --git a/contrib/ipfilter/test/expected/ipv6.6 b/contrib/ipfilter/test/expected/ipv6.6 deleted file mode 100644 index efd0421..0000000 --- a/contrib/ipfilter/test/expected/ipv6.6 +++ /dev/null @@ -1,10 +0,0 @@ -pass -pass -pass -pass --------- -nomatch -nomatch -block -nomatch --------- diff --git a/contrib/ipfilter/test/expected/l1 b/contrib/ipfilter/test/expected/l1 deleted file mode 100644 index e4a081d..0000000 --- a/contrib/ipfilter/test/expected/l1 +++ /dev/null @@ -1,56 +0,0 @@ -log in all -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF IN -01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN --------- -pass in on anon0 all head 100 --------- -pass in log quick from 3.3.3.3 to any group 100 --------- -pass in log body quick from 2.2.2.2 to any -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN --------- -pass in log quick proto tcp from 1.1.1.1 to any flags S keep state -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN -01/01/1970 00:00:00.000000 e1 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN --------- -pass in log first quick proto tcp from 1.1.1.1 to any flags S keep state -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN -01/01/1970 00:00:00.000000 e1 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN -01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @100:1 p 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN --------- diff --git a/contrib/ipfilter/test/expected/l1.b b/contrib/ipfilter/test/expected/l1.b deleted file mode 100644 index e06e486..0000000 --- a/contrib/ipfilter/test/expected/l1.b +++ /dev/null @@ -1,56 +0,0 @@ -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF IN -01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN --------- --------- --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01 02 03 04 05 06 07 08 09 0a 0b 0d ............ -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01 02 03 04 05 06 07 08 09 0a 0b 0d 0e 0f 40 61 ..............@a -42 63 44 65 46 67 48 69 4a 6b 4c 6d BcDeFgHiJkLm -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN -01/01/1970 00:00:00.000000 e1 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN -01/01/1970 00:00:00.000000 e1 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN -01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01 02 03 04 05 06 07 08 09 0a 0b 0d ............ -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01 02 03 04 05 06 07 08 09 0a 0b 0d 0e 0f 40 61 ..............@a -42 63 44 65 46 67 48 69 4a 6b 4c 6d BcDeFgHiJkLm -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @100:1 p 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN --------- diff --git a/contrib/ipfilter/test/expected/n1 b/contrib/ipfilter/test/expected/n1 deleted file mode 100644 index 20eaedc..0000000 --- a/contrib/ipfilter/test/expected/n1 +++ /dev/null @@ -1,197 +0,0 @@ -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.2.2.2 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -List of active MAP/Redirect filters: -map zx0 10.1.1.1/32 -> 10.2.2.2/32 - -List of active sessions: -MAP 10.1.1.1 <- -> 10.2.2.2 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.2.2.2 [10.1.1.2] - -Hostmap table: -10.1.1.1,10.4.3.2 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.2 -15 -> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 48(20) 1 10.3.4.5 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1 -> zx0 ip #0 20(20) 34 10.3.4.5 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.3.4.5 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.1.1.2 -15 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.3.4.5 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 - -List of active sessions: -MAP 10.1.1.3 <- -> 10.3.4.5 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.5 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.5 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.3.4.5 [10.4.3.2] -MAP 10.1.1.2 1026 <- -> 10.3.4.5 1026 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 1025 [10.1.1.1 1025] -MAP 10.1.1.2 <- -> 10.3.4.5 [10.1.1.1] -MAP 10.1.1.0 <- -> 10.3.4.5 [10.1.1.2] - -Hostmap table: -10.1.1.3,10.4.3.4 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.4.3.4 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.4.3.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.4.3.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 3) -10.1.1.0,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.3.4.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.3.4.2 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.3.4.3 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.3,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.3,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.3.4.3 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.3.4.3 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.3.4.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.3.4.4 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.3.4.4 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.0/24 - -List of active sessions: -MAP 10.1.1.3 <- -> 10.3.4.4 [10.4.3.4] -MAP 10.1.1.3 <- -> 10.3.4.4 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.3 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.3 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.3.4.3 [10.4.3.2] -MAP 10.1.1.2 1026 <- -> 10.3.4.3 1026 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.3 1025 [10.1.1.1 1025] -MAP 10.1.1.2 <- -> 10.3.4.3 [10.1.1.1] -MAP 10.1.1.1 <- -> 10.3.4.2 [10.1.1.2] -MAP 10.1.1.0 <- -> 10.3.4.1 [10.1.1.2] - -Hostmap table: -10.1.1.3,10.4.3.4 -> 10.3.4.4,0.0.0.0 (use = 2) -10.1.1.2,10.4.3.4 -> 10.3.4.3,0.0.0.0 (use = 1) -10.1.1.2,10.4.3.2 -> 10.3.4.3,0.0.0.0 (use = 1) -10.1.1.1,10.4.3.2 -> 10.3.4.3,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.3,0.0.0.0 (use = 3) -10.1.1.1,10.1.1.2 -> 10.3.4.2,0.0.0.0 (use = 1) -10.1.1.0,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n10 b/contrib/ipfilter/test/expected/n10 deleted file mode 100644 index 0c03ff0..0000000 --- a/contrib/ipfilter/test/expected/n10 +++ /dev/null @@ -1,72 +0,0 @@ -4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 655d 0000 0204 0064 - -List of active MAP/Redirect filters: -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 100 - -List of active sessions: -MAP 192.168.1.3 32818 <- -> 203.203.203.203 32818 [150.203.224.2 21] - -Hostmap table: -192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 61d9 0000 0204 03e8 - -List of active MAP/Redirect filters: -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 1000 - -List of active sessions: -MAP 192.168.1.3 32818 <- -> 203.203.203.203 32818 [150.203.224.2 21] - -Hostmap table: -192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 600d 0000 0204 05b4 - -List of active MAP/Redirect filters: -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 10000 - -List of active sessions: -MAP 192.168.1.3 32818 <- -> 203.203.203.203 32818 [150.203.224.2 21] - -Hostmap table: -192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n100 b/contrib/ipfilter/test/expected/n100 deleted file mode 100644 index 80f00a1..0000000 --- a/contrib/ipfilter/test/expected/n100 +++ /dev/null @@ -1,33 +0,0 @@ -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.1 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.2 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.3 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.4 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.1 -> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203 -> zx0 ip #0 40(20) 6 4.4.4.4,101 > 6.6.0.5,203 -List of active MAP/Redirect filters: -rewrite out on zx0 from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16; - -List of active sessions: -RWR-MAP 1.1.1.1 101 2.2.2.3 203 <- -> 4.4.4.4 101 6.6.0.5 203 -RWR-MAP 1.1.1.1 2.2.2.4 <- -> 4.4.4.4 6.6.0.4 -RWR-MAP 1.2.1.2 2.2.2.3 <- -> 4.4.4.4 6.6.0.3 -RWR-MAP 1.1.1.2 2.2.2.3 <- -> 4.4.4.4 6.6.0.2 -RWR-MAP 1.1.1.1 2.2.2.3 <- -> 4.4.4.4 6.6.0.1 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n101 b/contrib/ipfilter/test/expected/n101 deleted file mode 100644 index ad0ad97..0000000 --- a/contrib/ipfilter/test/expected/n101 +++ /dev/null @@ -1,29 +0,0 @@ -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.1.1.2 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.2.1.2 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.4 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3 -> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203 -> zx0 ip #0 40(20) 6 4.4.4.4,101 > 6.6.0.1,203 -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16; - -List of active sessions: -RWR-MAP 1.1.1.1 101 2.2.2.3 203 <- -> 4.4.4.4 101 6.6.0.1 203 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n102 b/contrib/ipfilter/test/expected/n102 deleted file mode 100644 index a2f130e..0000000 --- a/contrib/ipfilter/test/expected/n102 +++ /dev/null @@ -1,29 +0,0 @@ -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.1.1.2 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.2.1.2 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.4 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3 -> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203 -> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,203 -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000-2000 dst 6.6.0.0/16; - -List of active sessions: -RWR-MAP 1.1.1.1 101 2.2.2.3 203 <- -> 4.4.4.4 1000 6.6.0.1 203 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n103 b/contrib/ipfilter/test/expected/n103 deleted file mode 100644 index 31ed740..0000000 --- a/contrib/ipfilter/test/expected/n103 +++ /dev/null @@ -1,33 +0,0 @@ -> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203 -> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,4000 -> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,4000 -> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.1,4000 -> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.2,4000 -> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.2,4001 -< zx0 ip #0 40(20) 6 2.2.2.3,4000 > 4.4.4.4,1000 -> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.2,4001 -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,4000-4001; - -List of active sessions: -RWR-MAP 7.7.7.7 101 2.2.2.3 203 <- -> 4.4.4.4 1000 6.6.0.2 4001 -RWR-MAP 5.5.5.5 101 2.2.2.3 203 <- -> 4.4.4.4 1001 6.6.0.2 4001 -RWR-MAP 10.10.10.10 101 2.2.2.3 203 <- -> 4.4.4.4 1001 6.6.0.2 4000 -RWR-MAP 1.1.1.2 101 2.2.2.3 203 <- -> 4.4.4.4 1001 6.6.0.1 4000 -RWR-MAP 1.1.1.1 101 2.2.2.3 203 <- -> 4.4.4.4 1000 6.6.0.1 4000 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n104 b/contrib/ipfilter/test/expected/n104 deleted file mode 100644 index 3b8a9de..0000000 --- a/contrib/ipfilter/test/expected/n104 +++ /dev/null @@ -1,50 +0,0 @@ -4500 0028 0001 0000 ff06 b1c3 0404 0001 0606 0001 03e8 0fa0 0000 0001 1000 0001 5010 2000 623f 0000 - -4500 0028 0002 0000 ff06 b5c8 0202 0202 0101 0101 00cb 0065 0000 0001 1000 0001 5010 2000 789d 0000 - -4500 0028 0003 0000 ff06 b1c0 0404 0002 0606 0001 03e8 0fa0 0000 0001 1000 0001 5010 2000 623e 0000 - -4500 0028 0004 0000 ff06 b5c6 0202 0202 0101 0101 00cb 0066 0000 0001 1000 0001 5010 2000 789c 0000 - -4500 0028 0005 0000 ff06 b1be 0404 0002 0606 0001 03e9 0fa0 0000 0001 1000 0001 5010 2000 623d 0000 - -4500 0028 0006 0000 ff06 b5c4 0202 0202 0101 0101 00cb 0067 0000 0001 1000 0001 5010 2000 789b 0000 - -4500 0028 0007 0000 ff06 b1bb 0404 0002 0606 0002 03e9 0fa0 0000 0001 1000 0001 5010 2000 623c 0000 - -4500 0028 0008 0000 ff06 b5c2 0202 0202 0101 0101 00cb 0068 0000 0001 1000 0001 5010 2000 789a 0000 - -4500 0028 0009 0000 ff06 b1b9 0404 0002 0606 0002 03e9 0fa1 0000 0001 1000 0001 5010 2000 623b 0000 - -4500 0028 000a 0000 ff06 b5c0 0202 0202 0101 0101 00cb 0069 0000 0001 1000 0001 5010 2000 7899 0000 - -4500 0028 000b 0000 ff06 b1b6 0404 0003 0606 0002 03e9 0fa1 0000 0001 1000 0001 5010 2000 623a 0000 - -4500 0028 000c 0000 ff06 b5be 0202 0202 0101 0101 00cb 006a 0000 0001 1000 0001 5010 2000 7898 0000 - -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.0.0/24,1000-1001 dst 6.6.0.0/16,4000-4001; - -List of active sessions: -RWR-MAP 1.1.1.1 106 2.2.2.2 203 <- -> 4.4.0.3 1001 6.6.0.2 4001 -RWR-MAP 1.1.1.1 105 2.2.2.2 203 <- -> 4.4.0.2 1001 6.6.0.2 4001 -RWR-MAP 1.1.1.1 104 2.2.2.2 203 <- -> 4.4.0.2 1001 6.6.0.2 4000 -RWR-MAP 1.1.1.1 103 2.2.2.2 203 <- -> 4.4.0.2 1001 6.6.0.1 4000 -RWR-MAP 1.1.1.1 102 2.2.2.2 203 <- -> 4.4.0.2 1000 6.6.0.1 4000 -RWR-MAP 1.1.1.1 101 2.2.2.2 203 <- -> 4.4.0.1 1000 6.6.0.1 4000 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n105 b/contrib/ipfilter/test/expected/n105 deleted file mode 100644 index d45a4af..0000000 --- a/contrib/ipfilter/test/expected/n105 +++ /dev/null @@ -1,25 +0,0 @@ -4500 0028 0001 0000 ff06 adc0 0404 0404 0606 0001 03e8 0c38 0000 0001 1000 0001 5010 2000 61a4 0000 - -4500 0028 0001 0000 ff06 b5c9 0202 0202 0101 0101 0050 0065 0000 0001 1000 0001 5010 2000 7918 0000 - -List of active MAP/Redirect filters: -rewrite in on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,port = 3128; - -List of active sessions: -RWR-RDR 1.1.1.1 101 2.2.2.2 80 <- -> 4.4.4.4 1000 6.6.0.1 3128 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n106 b/contrib/ipfilter/test/expected/n106 deleted file mode 100644 index d466e65..0000000 --- a/contrib/ipfilter/test/expected/n106 +++ /dev/null @@ -1,25 +0,0 @@ -4500 0028 0001 0000 ff06 adc0 0404 0404 0606 0001 03e8 0c38 0000 0001 1000 0001 5010 2000 61a4 0000 - -4500 0028 0001 0000 ff06 b5c9 0202 0202 0101 0101 0050 0065 0000 0001 1000 0001 5010 2000 7918 0000 - -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,port = 3128; - -List of active sessions: -RWR-MAP 1.1.1.1 101 2.2.2.2 80 <- -> 4.4.4.4 1000 6.6.0.1 3128 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n11 b/contrib/ipfilter/test/expected/n11 deleted file mode 100644 index ea11b93..0000000 --- a/contrib/ipfilter/test/expected/n11 +++ /dev/null @@ -1,124 +0,0 @@ -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 1.6.7.8 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -List of active MAP/Redirect filters: -bimap zx0 10.1.1.1/32 -> 1.6.7.8/32 - -List of active sessions: -BIMAP 10.1.1.1 <- -> 1.6.7.8 [10.1.1.2] - -Hostmap table: -10.1.1.1,10.1.1.2 -> 1.6.7.8,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2 -15 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.1 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.1.1.0 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -List of active MAP/Redirect filters: -bimap zx0 10.1.1.0/24 -> 10.2.2.2/32 - -List of active sessions: -BIMAP 10.1.1.0 <- -> 10.2.2.2 [10.2.3.4] -BIMAP 10.1.1.2 <- -> 10.2.2.2 [10.1.1.1] -BIMAP 10.1.1.0 <- -> 10.2.2.2 [10.1.1.2] - -Hostmap table: -10.1.1.2,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.0,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.3.4.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.3.4.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.3.4.2 > 10.1.1.1 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.5 -List of active MAP/Redirect filters: -bimap zx0 10.1.1.0/24 -> 10.3.4.0/24 - -List of active sessions: -BIMAP 10.1.1.5 <- -> 10.3.4.5 [10.1.1.2] -BIMAP 10.1.1.5 <- -> 10.3.4.5 [10.1.1.1] -BIMAP 10.1.1.5 <- -> 10.3.4.5 [10.1.1.0] -BIMAP 10.1.1.2 <- -> 10.3.4.2 [10.1.1.1] -BIMAP 10.1.1.1 <- -> 10.3.4.1 [10.1.1.2] -BIMAP 10.1.1.0 <- -> 10.3.4.0 [10.1.1.2] - -Hostmap table: -10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.0,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n11_6 b/contrib/ipfilter/test/expected/n11_6 deleted file mode 100644 index f1c80de..0000000 --- a/contrib/ipfilter/test/expected/n11_6 +++ /dev/null @@ -1,124 +0,0 @@ -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 1:0:0:0:0:6:7:8 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0: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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 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] - -Hostmap table: -10:1:1::1,10:1:1::2 -> 1::6:7:8,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -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 -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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:1:1:0:0:0:0:0 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 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] -BIMAP 10:1:1::2 <- -> 10::2:2:2 [10:1:1::1] -BIMAP 10:1:1:: <- -> 10::2:2:2 [10:1:1::2] - -Hostmap table: -10:1:1::2,10:1:1::1 -> 10::2:2:2,any (use = 1) -10:1:1::,10:1:1::2 -> 10::2:2:2,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4: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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:5 -< 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 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] -BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::1] -BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::] -BIMAP 10:1:1::2 <- -> 10::3:4:2 [10:1:1::1] -BIMAP 10:1:1::1 <- -> 10::3:4:1 [10:1:1::2] -BIMAP 10:1:1:: <- -> 10::3:4:0 [10:1:1::2] - -Hostmap table: -10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1) -10:1:1::,10:1:1::2 -> 10::3:4:1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n12 b/contrib/ipfilter/test/expected/n12 deleted file mode 100644 index 56b3a78..0000000 --- a/contrib/ipfilter/test/expected/n12 +++ /dev/null @@ -1,28 +0,0 @@ -4510 0040 2020 4000 4006 9478 c0a8 01bc c0a8 0303 2710 0017 4e33 298e 0000 0000 b002 4000 6ff8 0000 0204 05b4 0101 0402 0103 0300 0101 080a 0c72 549e 0000 0000 - -4500 003c 00b0 4000 fe06 7964 c0a8 0303 c0a8 7e53 0017 12c2 f674 e02c 4e33 298f a012 2798 7ace 0000 0101 080a 2c05 b797 0c72 549e 0103 0300 0204 05b4 - -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 sequential - -List of active sessions: -MAP 192.168.126.83 4802 <- -> 192.168.1.188 10000 [192.168.3.3 23] - -Hostmap table: -192.168.126.83,192.168.3.3 -> 0.0.0.0,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n12_6 b/contrib/ipfilter/test/expected/n12_6 deleted file mode 100644 index 9ef040a..0000000 --- a/contrib/ipfilter/test/expected/n12_6 +++ /dev/null @@ -1,28 +0,0 @@ -6000 0000 002c 0640 c0a8 0100 0000 0000 0000 0000 0000 00bc c0a8 0300 0000 0000 0000 0000 0000 0003 2710 0017 4e33 298e 0000 0000 b002 4000 6ff8 0000 0204 05b4 0101 0402 0103 0300 0101 080a 0c72 549e 0000 0000 - -6000 0000 0028 06fe c0a8 0300 0000 0000 0000 0000 0000 0003 c0a8 7e00 0000 0000 0000 0000 0000 0053 0017 12c2 f674 e02c 4e33 298f a012 2798 7ace 0000 0101 080a 2c05 b797 0c72 549e 0103 0300 0204 05b4 - -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 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] - -Hostmap table: -c0a8:7e00::53,c0a8:300::3 -> any,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n13 b/contrib/ipfilter/test/expected/n13 deleted file mode 100644 index e6d26b2..0000000 --- a/contrib/ipfilter/test/expected/n13 +++ /dev/null @@ -1,32 +0,0 @@ -> le0 ip #0 20(20) 0 203.1.1.23 > 150.1.1.1 -> le0 ip #0 20(20) 0 203.1.1.23 > 150.1.1.2 -> le0 ip #0 20(20) 0 203.1.1.24 > 150.1.1.2 -> le0 ip #0 20(20) 0 203.1.1.25 > 150.1.1.1 -List of active MAP/Redirect filters: -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 - -List of active sessions: -MAP 192.168.1.3 <- -> 203.1.1.25 [150.1.1.1] -MAP 192.168.1.2 <- -> 203.1.1.24 [150.1.1.2] -MAP 192.168.1.1 <- -> 203.1.1.23 [150.1.1.2] -MAP 192.168.1.1 <- -> 203.1.1.23 [150.1.1.1] - -Hostmap table: -192.168.1.3,150.1.1.1 -> 203.1.1.25,0.0.0.0 (use = 1) -192.168.1.2,150.1.1.2 -> 203.1.1.24,0.0.0.0 (use = 1) -192.168.1.1,150.1.1.2 -> 203.1.1.23,0.0.0.0 (use = 1) -192.168.1.1,150.1.1.1 -> 203.1.1.23,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n13_6 b/contrib/ipfilter/test/expected/n13_6 deleted file mode 100644 index d3b5fe7..0000000 --- a/contrib/ipfilter/test/expected/n13_6 +++ /dev/null @@ -1,32 +0,0 @@ -> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:23 > 150.1.1.1 -> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:23 > 150.1.1.2 -> 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 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] -MAP 192.168.1.2 <- -> 203:0:1::1:24 [150.1.1.2] -MAP 192.168.1.1 <- -> 203:0:1::1:23 [150.1.1.2] -MAP 192.168.1.1 <- -> 203:0:1::1:23 [150.1.1.1] - -Hostmap table: -192.168.1.3,150.1.1.1 -> 203:0:1:0:0:0:1:25,any (use = 1) -192.168.1.2,150.1.1.2 -> 203:0:1:0:0:0:1:24,any (use = 1) -192.168.1.1,150.1.1.2 -> 203:0:1:0:0:0:1:23,any (use = 1) -192.168.1.1,150.1.1.1 -> 203:0:1:0:0:0:1:23,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n14 b/contrib/ipfilter/test/expected/n14 deleted file mode 100644 index 7b1a19e..0000000 --- a/contrib/ipfilter/test/expected/n14 +++ /dev/null @@ -1,30 +0,0 @@ -< 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 -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 - -List of active sessions: -RDR 10.1.1.254 80 <- -> 203.1.1.1 80 [10.2.2.7 2000] -RDR 10.1.1.253 80 <- -> 203.1.1.1 80 [10.2.2.6 2000] -RDR 10.1.1.254 80 <- -> 203.1.1.1 80 [10.2.2.5 2000] - -Hostmap table: -10.2.2.7,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1) -10.2.2.6,203.1.1.1 -> 253.1.1.10,0.0.0.0 (use = 1) -10.2.2.5,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n14_6 b/contrib/ipfilter/test/expected/n14_6 deleted file mode 100644 index b999ee97..0000000 --- a/contrib/ipfilter/test/expected/n14_6 +++ /dev/null @@ -1,30 +0,0 @@ -< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:5,2000 > 10:1:1:0:0:0:0:254,80 -< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:6,2000 > 10:1:1:0:0:0:0:253,80 -< 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 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] -RDR 10:1:1::253 80 <- -> 203:0:1::1:1 80 [10::2:2:6 2000] -RDR 10:1:1::254 80 <- -> 203:0:1::1:1 80 [10::2:2:5 2000] - -Hostmap table: -10::2:2:7,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 1) -10::2:2:6,203:0:1:0:0:0:1:1 -> 253:0:1:0:0:0:1:10,any (use = 1) -10::2:2:5,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n15 b/contrib/ipfilter/test/expected/n15 deleted file mode 100644 index 3889f82..0000000 --- a/contrib/ipfilter/test/expected/n15 +++ /dev/null @@ -1,47 +0,0 @@ -< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80 -15 -List of active MAP/Redirect filters: -rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp - -List of active sessions: -RDR 3.3.3.3 80 <- -> 5.5.5.5 80 [9.9.9.9 10011] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80 -< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,81 -List of active MAP/Redirect filters: -rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80-88 tcp - -List of active sessions: -RDR 3.3.3.3 81 <- -> 2.2.2.2 80 [9.9.9.9 10011] -RDR 3.3.3.3 80 <- -> 5.5.5.5 80 [9.9.9.9 10011] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n15_6 b/contrib/ipfilter/test/expected/n15_6 deleted file mode 100644 index f01b72b..0000000 --- a/contrib/ipfilter/test/expected/n15_6 +++ /dev/null @@ -1,47 +0,0 @@ -< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80 -16 -List of active MAP/Redirect filters: -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] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< 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 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] -RDR 3:0:3::3:3 80 <- -> 5:5::5:5 80 [9:9:9::9 10011] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n16 b/contrib/ipfilter/test/expected/n16 deleted file mode 100644 index 0eb3954..0000000 --- a/contrib/ipfilter/test/expected/n16 +++ /dev/null @@ -1,29 +0,0 @@ -4520 0068 17e4 0000 6b11 cbba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -4500 0084 ee0f 0000 8001 e0a2 ac1f 5318 c05b ac33 0303 4ca1 0000 0000 4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -4500 0084 ee0f 0000 8001 4a21 45f8 4fc1 c05b ac33 0303 bf85 0000 0000 4520 0068 17e4 0000 6a11 3639 c05b ac33 45f8 4fc1 1194 94f8 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -List of active MAP/Redirect filters: -rdr vlan0 from 0/0 to 69.248.79.193/32 port = 38136 -> 172.31.83.24/32 port 2013 udp - -List of active sessions: -RDR 172.31.83.24 2013 <- -> 69.248.79.193 38136 [192.91.172.51 4500] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n17 b/contrib/ipfilter/test/expected/n17 deleted file mode 100644 index f336bb0..0000000 --- a/contrib/ipfilter/test/expected/n17 +++ /dev/null @@ -1,24 +0,0 @@ -4500 00a0 0000 0100 3f06 7555 0101 0101 0201 0101 0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00a0 0000 0100 3f06 7553 0201 0101 0101 0103 0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -List of active MAP/Redirect filters: -bimap zx0 0/0 -> 1.1.1.3/32 - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n18 b/contrib/ipfilter/test/expected/n18 deleted file mode 100644 index c51c11c..0000000 --- a/contrib/ipfilter/test/expected/n18 +++ /dev/null @@ -1,111 +0,0 @@ -> z0 ip #0 40(20) 6 1.1.1.1,1 > 3.3.3.3,30 -> z0 ip #0 40(20) 6 1.1.1.1,2 > 3.3.3.3,31 -> z0 ip #0 40(20) 6 1.1.1.1,3 > 3.3.3.3,32 -> z0 ip #0 40(20) 6 1.1.1.1,4 > 3.3.3.3,33 -> z0 ip #0 40(20) 6 1.1.1.1,1 > 3.3.3.3,34 -> z0 ip #0 40(20) 6 1.1.1.1,2 > 3.3.3.3,35 -> 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 sequential - -List of active sessions: -MAP 2.2.2.2 29 <- -> 1.1.1.1 4 [3.3.3.3 37] -MAP 2.2.2.2 28 <- -> 1.1.1.1 3 [3.3.3.3 36] -MAP 2.2.2.2 27 <- -> 1.1.1.1 2 [3.3.3.3 35] -MAP 2.2.2.2 26 <- -> 1.1.1.1 1 [3.3.3.3 34] -MAP 2.2.2.2 25 <- -> 1.1.1.1 4 [3.3.3.3 33] -MAP 2.2.2.2 24 <- -> 1.1.1.1 3 [3.3.3.3 32] -MAP 2.2.2.2 23 <- -> 1.1.1.1 2 [3.3.3.3 31] -MAP 2.2.2.2 22 <- -> 1.1.1.1 1 [3.3.3.3 30] - -Hostmap table: -2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> z0 ip #0 40(20) 6 1.1.1.1,1000 > 3.3.3.3,30 -> z0 ip #0 40(20) 6 1.1.1.1,1001 > 3.3.3.3,31 -> z0 ip #0 40(20) 6 1.1.1.1,1002 > 3.3.3.3,32 -> z0 ip #0 40(20) 6 1.1.1.1,1003 > 3.3.3.3,33 -> z0 ip #0 40(20) 6 1.1.1.1,1004 > 3.3.3.3,34 -> z0 ip #0 40(20) 6 1.1.1.1,1005 > 3.3.3.3,35 -> 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 sequential - -List of active sessions: -MAP 2.2.2.2 29 <- -> 1.1.1.1 1007 [3.3.3.3 37] -MAP 2.2.2.2 28 <- -> 1.1.1.1 1006 [3.3.3.3 36] -MAP 2.2.2.2 27 <- -> 1.1.1.1 1005 [3.3.3.3 35] -MAP 2.2.2.2 26 <- -> 1.1.1.1 1004 [3.3.3.3 34] -MAP 2.2.2.2 25 <- -> 1.1.1.1 1003 [3.3.3.3 33] -MAP 2.2.2.2 24 <- -> 1.1.1.1 1002 [3.3.3.3 32] -MAP 2.2.2.2 23 <- -> 1.1.1.1 1001 [3.3.3.3 31] -MAP 2.2.2.2 22 <- -> 1.1.1.1 1000 [3.3.3.3 30] - -Hostmap table: -2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> z0 ip #0 40(20) 6 1.1.1.1,1000 > 3.3.3.3,30 -> z0 ip #0 40(20) 6 1.1.1.1,1001 > 3.3.3.3,31 -> z0 ip #0 40(20) 6 1.1.1.1,1002 > 3.3.3.3,32 -> z0 ip #0 40(20) 6 1.1.1.1,1003 > 3.3.3.3,33 -> z0 ip #0 40(20) 6 1.1.1.1,1004 > 3.3.3.3,34 -> z0 ip #0 40(20) 6 1.1.1.1,1005 > 3.3.3.3,35 -> 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 sequential - -List of active sessions: -MAP 2.2.2.2 29 <- -> 1.1.1.1 1007 [3.3.3.3 37] -MAP 2.2.2.2 28 <- -> 1.1.1.1 1006 [3.3.3.3 36] -MAP 2.2.2.2 27 <- -> 1.1.1.1 1005 [3.3.3.3 35] -MAP 2.2.2.2 26 <- -> 1.1.1.1 1004 [3.3.3.3 34] -MAP 2.2.2.2 25 <- -> 1.1.1.1 1003 [3.3.3.3 33] -MAP 2.2.2.2 24 <- -> 1.1.1.1 1002 [3.3.3.3 32] -MAP 2.2.2.2 23 <- -> 1.1.1.1 1001 [3.3.3.3 31] -MAP 2.2.2.2 22 <- -> 1.1.1.1 1000 [3.3.3.3 30] - -Hostmap table: -2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n1_6 b/contrib/ipfilter/test/expected/n1_6 deleted file mode 100644 index 347bf4a..0000000 --- a/contrib/ipfilter/test/expected/n1_6 +++ /dev/null @@ -1,197 +0,0 @@ -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:2:2:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< 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:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< 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: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 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] -MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:1::2] - -Hostmap table: -10:1:1::1,10:4:3::2 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -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 -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 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:2 -< 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 -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 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] -MAP 10:1:1::2 <- -> 10::3:4:5 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:5 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::3:4:5 [10:4:3::2] -MAP 10:1:1::2 1026 <- -> 10::3:4:5 1026 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 1025 [10:1:1::1 1025] -MAP 10:1:1::2 <- -> 10::3:4:5 [10:1:1::1] -MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2] - -Hostmap table: -10:1:1::3,10:4:3::4 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:4:3::4 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:4:3::2 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:4:3::2 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 3) -10:1:1::,10:1:1::2 -> 10::3:4:5,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:2 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:3 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1026 > 10:1:1:0:0:0:0:1,1025 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:3 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:3 > 10:4:3:0:0:0:0:2 -< 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:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:4 > 10:4:3:0:0:0:0:4 -< 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: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 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] -MAP 10:1:1::3 <- -> 10::3:4:4 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:3 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:3 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::3:4:3 [10:4:3::2] -MAP 10:1:1::2 1026 <- -> 10::3:4:3 1026 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:3 1025 [10:1:1::1 1025] -MAP 10:1:1::2 <- -> 10::3:4:3 [10:1:1::1] -MAP 10:1:1::1 <- -> 10::3:4:2 [10:1:1::2] -MAP 10:1:1:: <- -> 10::3:4:1 [10:1:1::2] - -Hostmap table: -10:1:1::3,10:4:3::4 -> 10::3:4:4,any (use = 2) -10:1:1::2,10:4:3::4 -> 10::3:4:3,any (use = 1) -10:1:1::2,10:4:3::2 -> 10::3:4:3,any (use = 1) -10:1:1::1,10:4:3::2 -> 10::3:4:3,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:3,any (use = 3) -10:1:1::1,10:1:1::2 -> 10::3:4:2,any (use = 1) -10:1:1::,10:1:1::2 -> 10::3:4:1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n2 b/contrib/ipfilter/test/expected/n2 deleted file mode 100644 index 836608a..0000000 --- a/contrib/ipfilter/test/expected/n2 +++ /dev/null @@ -1,191 +0,0 @@ -> zx0 ip #0 40(20) 6 10.2.2.2,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.2.2.2,10001 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 sequential - -List of active sessions: -MAP 10.1.1.1 1025 <- -> 10.2.2.2 10001 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.2.2.2 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential - -List of active sessions: -MAP 10.1.1.2 1025 <- -> 10.3.4.5 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10003 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.1,10004 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10005 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10006 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10007 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10008 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 10.1.1.3 2003 <- -> 10.3.4.1 10008 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.1 10007 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.1 10006 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.1 10005 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10004 [10.1.1.1 1025] -MAP 10.1.1.2 1026 <- -> 10.3.4.1 10003 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10002 [10.1.1.1 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10001 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.3,10.1.4.1 -> 10.3.4.1,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 3) -10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -15 -> zx0 ip #0 28(20) 17 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.1.1.3,2000 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential - -List of active sessions: -MAP 10.1.1.3 2003 <- -> 10.3.4.5 40000 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.5 40001 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.5 40000 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.5 40001 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40000 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40001 [10.1.1.1 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 40001 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 40000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n200 b/contrib/ipfilter/test/expected/n200 deleted file mode 100644 index 0f3c6a5..0000000 --- a/contrib/ipfilter/test/expected/n200 +++ /dev/null @@ -1,25 +0,0 @@ -4500 0044 0000 0000 ff11 bda6 7f00 0001 7f00 0001 2775 2775 0030 0000 4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 - -4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 - -List of active MAP/Redirect filters: -divert in on bar0 proto tcp from 0/0 to 0/0 -> src 127.0.0.1/32,10101 dst 127.0.0.1/32,10101 udp; - -List of active sessions: -DIV-RDR 127.0.0.1 10101 <- -> 88.88.88.88 80 [99.99.99.99 909] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n2_6 b/contrib/ipfilter/test/expected/n2_6 deleted file mode 100644 index 08abc8f..0000000 --- a/contrib/ipfilter/test/expected/n2_6 +++ /dev/null @@ -1,191 +0,0 @@ -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,10001 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128 portmap tcp 10000:20000 sequential - -List of active sessions: -MAP 10:1:1::1 1025 <- -> 10::2:2:2 10001 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::2:2:2 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::2:2:2,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential - -List of active sessions: -MAP 10:1:1::2 1025 <- -> 10::3:4:5 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10003 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10004 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10005 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10006 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10007 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10008 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 10:1:1::3 2003 <- -> 10::3:4:1 10008 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:1 10007 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:1 10006 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:1 10005 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10004 [10:1:1::1 1025] -MAP 10:1:1::2 1026 <- -> 10::3:4:1 10003 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10002 [10:1:1::1 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10001 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::3,10:1:4::1 -> 10::3:4:1,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:1,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:1,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 3) -10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::3:4:1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -16 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:1:1:0:0:0:0:3,2000 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential - -List of active sessions: -MAP 10:1:1::3 2003 <- -> 10::3:4:5 40000 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:5 40001 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:5 40000 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:5 40001 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40000 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40001 [10:1:1::1 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 40001 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 40000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 2) -10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::3:4:5,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n3 b/contrib/ipfilter/test/expected/n3 deleted file mode 100644 index 66ada76..0000000 --- a/contrib/ipfilter/test/expected/n3 +++ /dev/null @@ -1,66 +0,0 @@ -> zz0 ip #0 40(20) 6 192.168.2.1,1488 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.2.1,1276 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.2.1,1032 > 203.1.1.1,80 -> zz0 ip #0 28(20) 17 192.168.2.1,1032 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.2.1,65299 > 203.1.1.1,80 -List of active MAP/Redirect filters: -map zz0 10.1.0.0/16 -> 192.168.2.0/24 portmap tcp/udp auto - -List of active sessions: -MAP 10.1.255.255 65535 <- -> 192.168.2.1 65299 [203.1.1.1 80] -MAP 10.1.0.0 32768 <- -> 192.168.2.1 1032 [203.1.1.1 80] -MAP 10.1.0.0 32768 <- -> 192.168.2.1 1032 [203.1.1.1 80] -MAP 10.1.1.1 252 <- -> 192.168.2.1 1276 [203.1.1.1 80] -MAP 10.1.1.1 5000 <- -> 192.168.2.1 1488 [203.1.1.1 80] - -Hostmap table: -10.1.255.255,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 1) -10.1.0.0,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 2) -10.1.1.1,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zz0 ip #0 40(20) 6 192.168.1.1,1488 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.1.1,1276 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.1.0,1032 > 203.1.1.1,80 -> zz0 ip #0 28(20) 17 192.168.1.0,1032 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.1.255,65299 > 203.1.1.1,80 -List of active MAP/Redirect filters: -map-block zz0 10.1.0.0/16 -> 192.168.1.0/24 ports 252 - -List of active sessions: -MAP-BLOCK 10.1.255.255 65535 <- -> 192.168.1.255 65299 [203.1.1.1 80] -MAP-BLOCK 10.1.0.0 32768 <- -> 192.168.1.0 1032 [203.1.1.1 80] -MAP-BLOCK 10.1.0.0 32768 <- -> 192.168.1.0 1032 [203.1.1.1 80] -MAP-BLOCK 10.1.1.1 252 <- -> 192.168.1.1 1276 [203.1.1.1 80] -MAP-BLOCK 10.1.1.1 5000 <- -> 192.168.1.1 1488 [203.1.1.1 80] - -Hostmap table: -10.1.255.255,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 1) -10.1.0.0,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 2) -10.1.1.1,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n4 b/contrib/ipfilter/test/expected/n4 deleted file mode 100644 index 746ef7e..0000000 --- a/contrib/ipfilter/test/expected/n4 +++ /dev/null @@ -1,190 +0,0 @@ -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 port 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.2.2.1,10023 -> zx0 ip #0 40(20) 6 10.1.0.0,23 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 0/0 port 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.0.0 23 [10.3.3.3 12346] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,10053 -> zx0 ip #0 28(20) 17 10.1.1.0,53 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 port 53 -> 10.2.2.1/32 port 10053 udp - -List of active sessions: -RDR 10.2.2.1 10053 <- -> 10.1.1.0 53 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -15 -> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1/32 port 0 tcp - -List of active sessions: -RDR 10.2.2.1 53 <- -> 10.1.1.1 53 [10.3.3.3 12345] -RDR 10.2.2.1 23 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -15 -> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 -> 10.2.2.1/32 ip - -List of active sessions: -RDR 10.2.2.1 53 <- -> 10.1.1.0 53 [10.3.3.3 12345] -RDR 10.2.2.1 53 <- -> 10.1.1.1 53 [10.3.3.3 12345] -RDR 10.2.2.1 23 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n4_6 b/contrib/ipfilter/test/expected/n4_6 deleted file mode 100644 index e9a5ce3..0000000 --- a/contrib/ipfilter/test/expected/n4_6 +++ /dev/null @@ -1,190 +0,0 @@ -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 port 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:0:0:0:0:2:2:1,10023 -> zx0 ip6/0 20 0 6 10:1:0:0:0:0:0:0,23 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 any port 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:: 23 [10:3:3::3 12346] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10053 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:0,53 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 port 53 -> 10::2:2:1/128 port 10053 udp - -List of active sessions: -RDR 10::2:2:1 10053 <- -> 10:1:1:: 53 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -16 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 port 0 -> 10::2:2:1/128 port 0 tcp - -List of active sessions: -RDR 10::2:2:1 53 <- -> 10:1:1::1 53 [10:3:3::3 12345] -RDR 10::2:2:1 23 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -16 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 -> 10::2:2:1/128 ip - -List of active sessions: -RDR 10::2:2:1 53 <- -> 10:1:1:: 53 [10:3:3::3 12345] -RDR 10::2:2:1 53 <- -> 10:1:1::1 53 [10:3:3::3 12345] -RDR 10::2:2:1 23 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n5 b/contrib/ipfilter/test/expected/n5 deleted file mode 100644 index 423bf48..0000000 --- a/contrib/ipfilter/test/expected/n5 +++ /dev/null @@ -1,533 +0,0 @@ -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.2.2.2 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.2.2.2 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.2.2.2,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.1/32 -> 10.2.2.2/32 - -List of active sessions: -MAP 10.1.1.1 1025 <- -> 10.2.2.2 1025 [10.3.4.5 40000] -MAP 10.1.1.1 1026 <- -> 10.2.2.2 1026 [10.3.4.5 40000] -MAP 10.1.1.1 <- -> 10.2.2.2 [10.1.2.1] -MAP 10.1.1.1 1025 <- -> 10.2.2.2 1025 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.2.2.2 1025 [10.1.1.1 1025] -MAP 10.1.1.1 <- -> 10.2.2.2 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.2.2.2 [10.1.1.2] - -Hostmap table: -10.1.1.1,10.3.4.5 -> 10.2.2.2,0.0.0.0 (use = 2) -10.1.1.1,10.1.2.1 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.4.3.2 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.2 -15 -> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -15 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.3.4.5 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.3.4.5 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 from 10.1.1.0/24 to 10.1.0.0/16 -> 10.3.4.5/32 - -List of active sessions: -MAP 10.1.1.3 2003 <- -> 10.3.4.5 2003 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.5 2002 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.5 2001 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.5 2000 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 1025 [10.1.1.1 1025] -MAP 10.1.1.1 <- -> 10.3.4.5 [10.1.2.1] -MAP 10.1.1.0 <- -> 10.3.4.5 [10.1.1.2] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 1025 [10.1.1.2 1025] -MAP 10.1.1.2 1026 <- -> 10.3.4.5 1026 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 1025 [10.1.1.1 1025] -MAP 10.1.1.2 <- -> 10.3.4.5 [10.1.1.1] -MAP 10.1.1.0 <- -> 10.3.4.5 [10.1.1.2] - -Hostmap table: -10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 4) -10.1.1.0,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.3.4.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.3.4.1 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.3.4.1 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.3.4.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.3.4.2 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.3,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.3.4.3,1025 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.3.4.3,1025 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 from 10.1.1.0/24 ! to 10.1.0.0/16 -> 10.3.4.0/24 - -List of active sessions: -MAP 10.1.1.2 1025 <- -> 10.3.4.3 1025 [10.3.4.5 40001] -MAP 10.1.1.1 1025 <- -> 10.3.4.3 1025 [10.3.4.5 40000] -MAP 10.1.1.1 1026 <- -> 10.3.4.3 1026 [10.3.4.5 40000] -MAP 10.1.1.3 <- -> 10.3.4.2 [10.4.3.4] -MAP 10.1.1.3 <- -> 10.3.4.2 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.1 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.1 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.3.4.1 [10.4.3.2] - -Hostmap table: -10.1.1.2,10.3.4.5 -> 10.3.4.3,0.0.0.0 (use = 1) -10.1.1.1,10.3.4.5 -> 10.3.4.3,0.0.0.0 (use = 2) -10.1.1.3,10.4.3.4 -> 10.3.4.2,0.0.0.0 (use = 2) -10.1.1.2,10.4.3.4 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.2,10.4.3.2 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.4.3.2 -> 10.3.4.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.3.4.5,10001 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential - -List of active sessions: -MAP 10.1.1.2 1025 <- -> 10.3.4.5 10001 [10.3.4.5 40001] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.2,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10003 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.1,10004 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10005 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10006 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10007 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10008 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.1,10009 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.3.4.1,10010 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.3.4.1,10011 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.3.4.1,10012 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 10.1.2.1 80 <- -> 10.3.4.1 10012 [10.3.4.5 40001] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10011 [10.3.4.5 40001] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10010 [10.3.4.5 40000] -MAP 10.1.1.1 1026 <- -> 10.3.4.1 10009 [10.3.4.5 40000] -MAP 10.1.1.3 2003 <- -> 10.3.4.1 10008 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.1 10007 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.1 10006 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.1 10005 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10004 [10.1.1.1 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10003 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10002 [10.1.1.1 1025] -MAP 10.1.1.2 1026 <- -> 10.3.4.1 10001 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.2.1,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.2,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 2) -10.1.1.3,10.1.4.1 -> 10.3.4.1,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -15 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,40001 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,40000 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential - -List of active sessions: -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40000 [10.3.4.5 40001] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 40001 [10.3.4.5 40000] -MAP 10.1.1.1 1026 <- -> 10.3.4.5 40000 [10.3.4.5 40000] -MAP 10.1.1.3 2003 <- -> 10.3.4.5 40001 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.5 40000 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.5 40001 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.5 40000 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40001 [10.1.1.1 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 40000 [10.1.1.2 1025] -MAP 10.1.1.2 1026 <- -> 10.3.4.5 40001 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.2,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n5_6 b/contrib/ipfilter/test/expected/n5_6 deleted file mode 100644 index 1e7bc8e..0000000 --- a/contrib/ipfilter/test/expected/n5_6 +++ /dev/null @@ -1,533 +0,0 @@ -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:2:2:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< 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:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< 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: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 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128 - -List of active sessions: -MAP 10:1:1::1 1025 <- -> 10::2:2:2 1025 [10::3:4:5 40000] -MAP 10:1:1::1 1026 <- -> 10::2:2:2 1026 [10::3:4:5 40000] -MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:2::1] -MAP 10:1:1::1 1025 <- -> 10::2:2:2 1025 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::2:2:2 1025 [10:1:1::1 1025] -MAP 10:1:1::1 <- -> 10::2:2:2 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:1::2] - -Hostmap table: -10:1:1::1,10::3:4:5 -> 10::2:2:2,any (use = 2) -10:1:1::1,10:1:2::1 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:4:3::2 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -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 -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 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< 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:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< 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: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 -16 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:2: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,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 -> zx0 ip6/0 8 0 17 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,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 from 10:1:1::/112 to 10:1::/32 -> 10::3:4:5/128 - -List of active sessions: -MAP 10:1:1::3 2003 <- -> 10::3:4:5 2003 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:5 2002 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:5 2001 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:5 2000 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 1025 [10:1:1::1 1025] -MAP 10:1:1::1 <- -> 10::3:4:5 [10:1:2::1] -MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 1025 [10:1:1::2 1025] -MAP 10:1:1::2 1026 <- -> 10::3:4:5 1026 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 1025 [10:1:1::1 1025] -MAP 10:1:1::2 <- -> 10::3:4:5 [10:1:1::1] -MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2] - -Hostmap table: -10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:1:2::1 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 4) -10:1:1::,10:1:1::2 -> 10::3:4:5,any (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:1 > 10:4:3:0:0:0:0:2 -< 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:1 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:2 > 10:4:3:0:0:0:0:4 -< 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:2 > 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 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:3,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 from 10:1:1::/112 ! to 10:1::/32 -> 10::3:4:0/112 - -List of active sessions: -MAP 10:1:1::2 1025 <- -> 10::3:4:3 1025 [10::3:4:5 40001] -MAP 10:1:1::1 1025 <- -> 10::3:4:3 1025 [10::3:4:5 40000] -MAP 10:1:1::1 1026 <- -> 10::3:4:3 1026 [10::3:4:5 40000] -MAP 10:1:1::3 <- -> 10::3:4:2 [10:4:3::4] -MAP 10:1:1::3 <- -> 10::3:4:2 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:1 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:1 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::3:4:1 [10:4:3::2] - -Hostmap table: -10:1:1::2,10::3:4:5 -> 10::3:4:3,any (use = 1) -10:1:1::1,10::3:4:5 -> 10::3:4:3,any (use = 2) -10:1:1::3,10:4:3::4 -> 10::3:4:2,any (use = 2) -10:1:1::2,10:4:3::4 -> 10::3:4:1,any (use = 1) -10:1:1::2,10:4:3::2 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:4:3::2 -> 10::3:4:1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< 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:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< 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: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 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10001 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential - -List of active sessions: -MAP 10:1:1::2 1025 <- -> 10::3:4:5 10001 [10::3:4:5 40001] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::2,10::3:4:5 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:1,1025 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< 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:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< 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: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 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10003 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10004 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10005 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10006 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10007 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10008 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10009 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10010 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10011 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10012 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 10:1:2::1 80 <- -> 10::3:4:1 10012 [10::3:4:5 40001] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10011 [10::3:4:5 40001] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10010 [10::3:4:5 40000] -MAP 10:1:1::1 1026 <- -> 10::3:4:1 10009 [10::3:4:5 40000] -MAP 10:1:1::3 2003 <- -> 10::3:4:1 10008 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:1 10007 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:1 10006 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:1 10005 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10004 [10:1:1::1 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10003 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10002 [10:1:1::1 1025] -MAP 10:1:1::2 1026 <- -> 10::3:4:1 10001 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:2::1,10::3:4:5 -> 10::3:4:1,any (use = 1) -10:1:1::2,10::3:4:5 -> 10::3:4:1,any (use = 1) -10:1:1::1,10::3:4:5 -> 10::3:4:1,any (use = 2) -10:1:1::3,10:1:4::1 -> 10::3:4:1,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:1,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::3:4:1,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -> 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 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< 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 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< 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:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< 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: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 -16 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential - -List of active sessions: -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40000 [10::3:4:5 40001] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 40001 [10::3:4:5 40000] -MAP 10:1:1::1 1026 <- -> 10::3:4:5 40000 [10::3:4:5 40000] -MAP 10:1:1::3 2003 <- -> 10::3:4:5 40001 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:5 40000 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:5 40001 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:5 40000 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40001 [10:1:1::1 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 40000 [10:1:1::2 1025] -MAP 10:1:1::2 1026 <- -> 10::3:4:5 40001 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::2,10::3:4:5 -> 10::3:4:5,any (use = 1) -10:1:1::1,10::3:4:5 -> 10::3:4:5,any (use = 2) -10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n6 b/contrib/ipfilter/test/expected/n6 deleted file mode 100644 index 1afd94e..0000000 --- a/contrib/ipfilter/test/expected/n6 +++ /dev/null @@ -1,173 +0,0 @@ -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.2.2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -15 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 from 0/0 to 10.1.1.0/24 port = 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.2.2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -15 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 from 10.2.0.0/16 to 10.1.1.0/24 port = 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.2.2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -15 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 from 10.3.0.0/16 to 10.1.0.0/16 port = 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] -RDR 10.2.2.1 10023 <- -> 10.1.2.2 23 [10.3.0.1 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,10053 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 ! from 10.2.0.0/16 to 10.1.1.0/24 port = 53 -> 10.2.2.1/32 port 10053 udp - -List of active sessions: -RDR 10.2.2.1 10053 <- -> 10.1.1.0 53 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n6_6 b/contrib/ipfilter/test/expected/n6_6 deleted file mode 100644 index e10f9bd..0000000 --- a/contrib/ipfilter/test/expected/n6_6 +++ /dev/null @@ -1,173 +0,0 @@ -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:2:2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 -16 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 from any to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:2:2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 -16 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 from 10::/32 to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:2:2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -16 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 from 10:3::/32 to 10:1::/32 port = 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] -RDR 10::2:2:1 10023 <- -> 10:1:2::2 23 [10:3::1 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10053 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 ! from 10::/32 to 10:1:1::/112 port = 53 -> 10::2:2:1/128 port 10053 udp - -List of active sessions: -RDR 10::2:2:1 10053 <- -> 10:1:1:: 53 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n7 b/contrib/ipfilter/test/expected/n7 deleted file mode 100644 index 11b8115..0000000 --- a/contrib/ipfilter/test/expected/n7 +++ /dev/null @@ -1,98 +0,0 @@ -< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22 -< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.2.2.1,10050 -< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.2.2.1,10079 -< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.1.1.1,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 10.1.1.2,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.1.1.3,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 10.1.1.4,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.1.1.4,80 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10079 <- -> 10.1.1.1 79 [10.2.3.1 1233] -RDR 10.2.2.1 10050 <- -> 10.1.1.1 50 [10.2.3.1 1232] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.3.1 1231] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22 -< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.1.1.1,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 10.1.1.2,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.1.1.3,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 10.1.1.4,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.1.1.4,80 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1/32 port = 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 79 [10.2.3.1 1233] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 50 [10.2.3.1 1232] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.3.1 1231] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22 -< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.1.1.1,50 -< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.1.1.1,79 -< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.2.2.1,3128 -< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 1.2.2.129,3128 -< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.2.2.1,3128 -< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 1.2.2.129,3128 -< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.2.2.1,3128 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 port 80 -> 10.2.2.1,1.2.2.129 port 3128 tcp - -List of active sessions: -RDR 10.2.2.1 3128 <- -> 10.1.1.4 80 [10.2.3.1 1238] -RDR 1.2.2.129 3128 <- -> 10.1.1.4 80 [10.2.3.1 1237] -RDR 10.2.2.1 3128 <- -> 10.1.1.3 80 [10.2.3.1 1236] -RDR 1.2.2.129 3128 <- -> 10.1.1.2 80 [10.2.3.1 1235] -RDR 10.2.2.1 3128 <- -> 10.1.1.1 80 [10.2.3.1 1234] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n7_6 b/contrib/ipfilter/test/expected/n7_6 deleted file mode 100644 index 2563033..0000000 --- a/contrib/ipfilter/test/expected/n7_6 +++ /dev/null @@ -1,98 +0,0 @@ -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:0:0:0:0:2:2:1,10050 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:0:0:0:0:2:2:1,10079 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:1:1:0:0:0:0:1,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 10:1:1:0:0:0:0:2,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:1:1:0:0:0:0:3,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 10:1:1:0:0:0:0:4,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:1:1:0:0:0:0:4,80 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10079 <- -> 10:1:1::1 79 [10::2:3:1 1233] -RDR 10::2:2:1 10050 <- -> 10:1:1::1 50 [10::2:3:1 1232] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:3:1 1231] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:1:1:0:0:0:0:1,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 10:1:1:0:0:0:0:2,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:1:1:0:0:0:0:3,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 10:1:1:0:0:0:0:4,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:1:1:0:0:0:0:4,80 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port = 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 79 [10::2:3:1 1233] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 50 [10::2:3:1 1232] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:3:1 1231] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:1:1:0:0:0:0:1,50 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:1:1:0:0:0:0:1,79 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:0:0:0:0:2:2:1,3128 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 1:0:0:0:0:2:2:129,3128 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:0:0:0:0:2:2:1,3128 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 1:0:0:0:0:2:2:129,3128 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:0:0:0:0:2:2:1,3128 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 port 80 -> 10::2:2:1,1::2:2:129 port 3128 tcp - -List of active sessions: -RDR 10::2:2:1 3128 <- -> 10:1:1::4 80 [10::2:3:1 1238] -RDR 1::2:2:129 3128 <- -> 10:1:1::4 80 [10::2:3:1 1237] -RDR 10::2:2:1 3128 <- -> 10:1:1::3 80 [10::2:3:1 1236] -RDR 1::2:2:129 3128 <- -> 10:1:1::2 80 [10::2:3:1 1235] -RDR 10::2:2:1 3128 <- -> 10:1:1::1 80 [10::2:3:1 1234] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n8 b/contrib/ipfilter/test/expected/n8 deleted file mode 100644 index a5e938f..0000000 --- a/contrib/ipfilter/test/expected/n8 +++ /dev/null @@ -1,30 +0,0 @@ -4500 0054 8bc1 0000 ff01 13d5 0a0a 0a01 0404 0404 0800 efdf 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 8bc1 0000 ff01 13d5 0a0a 0a01 0404 0404 0800 efde 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -List of active MAP/Redirect filters: -map icmp0 2.2.2.0/24 -> 10.10.10.0/24 - -List of active sessions: -MAP 2.2.2.2 <- -> 10.10.10.1 [4.4.4.4] - -Hostmap table: -2.2.2.2,4.4.4.4 -> 10.10.10.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n8_6 b/contrib/ipfilter/test/expected/n8_6 deleted file mode 100644 index 4d08efe..0000000 --- a/contrib/ipfilter/test/expected/n8_6 +++ /dev/null @@ -1,30 +0,0 @@ -6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 7724 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764d 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 7723 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764c 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -List of active MAP/Redirect filters: -map icmp0 inet6 2::2:2:0/112 -> 10:10:10::/112 - -List of active sessions: -MAP 2::2:2:2 <- -> 10:10:10::1 [4:4:4::4] - -Hostmap table: -2::2:2:2,4:4:4::4 -> 10:10:10::1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n9 b/contrib/ipfilter/test/expected/n9 deleted file mode 100644 index 2c762be..0000000 --- a/contrib/ipfilter/test/expected/n9 +++ /dev/null @@ -1,29 +0,0 @@ -4500 0054 8bc1 0000 ff01 17d9 0202 0202 0a0a 0a01 0800 efdf 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 8bc1 0000 ff01 17d9 0202 0202 0a0a 0a01 0800 efde 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -List of active MAP/Redirect filters: -rdr icmp0 4.4.4.0/24 -> 10.10.10.1/32 ip - -List of active sessions: -RDR 10.10.10.1 <- -> 4.4.4.4 [2.2.2.2] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n9_6 b/contrib/ipfilter/test/expected/n9_6 deleted file mode 100644 index 134d74c..0000000 --- a/contrib/ipfilter/test/expected/n9_6 +++ /dev/null @@ -1,29 +0,0 @@ -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 772c 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764d 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 772b 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764c 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -List of active MAP/Redirect filters: -rdr icmp0 inet6 4:4:4::/112 -> 10:10:10::1/128 ip - -List of active sessions: -RDR 10:10:10::1 <- -> 4:4:4::4 [2::2:2:2] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni1 b/contrib/ipfilter/test/expected/ni1 deleted file mode 100644 index d4e2de2..0000000 --- a/contrib/ipfilter/test/expected/ni1 +++ /dev/null @@ -1,19 +0,0 @@ -4500 0028 0000 4000 0111 65b2 0606 0606 0404 0404 afc9 829e 0014 6308 0402 0000 3be5 468d 000a cfc3 - -4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 5773 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 afc9 829e 0014 6b10 - -4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 afc9 829e 0014 6b10 0402 0000 3be5 468d 000a cfc3 - -4500 0028 0001 4000 0111 65b0 0606 0607 0404 0404 4e20 829e 0014 c4b0 0402 0000 3be5 468d 000a cfc3 - -4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 5773 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 0800 829e 0014 12da - -4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 0800 829e 0014 12da 0402 0000 3be5 468d 000a cfc3 - -4500 0028 0002 4000 0111 65ae 0606 0608 0404 0404 07d0 829e 0014 0b00 0402 0000 3be5 468d 000a cfc3 - -4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 ff6a 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 5000 829e 0014 22e2 - -4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 5000 829e 0014 cad9 0402 0000 3be5 468d 000a cfc3 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni10 b/contrib/ipfilter/test/expected/ni10 deleted file mode 100644 index 050fb40..0000000 --- a/contrib/ipfilter/test/expected/ni10 +++ /dev/null @@ -1,8 +0,0 @@ -4500 003c 4706 4000 ff06 20a2 0404 0404 0606 0606 5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 afb9 0202 0202 0404 0404 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0404 0404 0202 0202 5000 0050 0000 0001 - -4500 0058 0001 0000 ff01 af98 0202 0202 0404 0404 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0404 0404 0202 0202 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni11 b/contrib/ipfilter/test/expected/ni11 deleted file mode 100644 index 6ed8ecc..0000000 --- a/contrib/ipfilter/test/expected/ni11 +++ /dev/null @@ -1,8 +0,0 @@ -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 - -4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni12 b/contrib/ipfilter/test/expected/ni12 deleted file mode 100644 index 590ec23..0000000 --- a/contrib/ipfilter/test/expected/ni12 +++ /dev/null @@ -1,8 +0,0 @@ -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 - -4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni13 b/contrib/ipfilter/test/expected/ni13 deleted file mode 100644 index 897bef3..0000000 --- a/contrib/ipfilter/test/expected/ni13 +++ /dev/null @@ -1,63 +0,0 @@ -4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 - -4500 002c 0000 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 - -4500 00c4 5e12 4000 8006 38cc c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00c4 0001 4000 4006 d6dd c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00d0 5e13 4000 8006 38bf c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 0048 0002 4000 4006 d758 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 - -4500 0040 5e14 4000 8006 394e c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff - -4500 0039 5e15 0000 802f 792b c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 - -4500 0020 0003 0000 ff2f 5856 c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff - -4500 0028 0004 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 - -4500 0038 0005 0000 ff2f 583c c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 002f 0006 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -4500 003c 5e16 0000 802f 7927 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 0036 5e17 0000 802f 792c c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 003a 0007 0000 ff2f 5838 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 0032 0008 0000 ff2f 583f c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 - -4500 0040 5e18 4000 8006 394a c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff - -4500 0038 5e19 0000 802f 7928 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 0009 0000 ff2f 5832 c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 5e1a 0000 802f 7921 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0044 000a 0000 ff2f 582b c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 - -4500 002a 000b 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 - -4500 002c 000c 0000 ff2f 5841 c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 - -4500 0048 5e1c 0000 802f 7915 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0042 000d 0000 ff2f 582a c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 - -4500 0030 000e 0000 ff2f 583b c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 - -4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 - -4500 0032 5e1f 0000 802f 7928 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc - -4500 002a 000f 0000 ff2f 5840 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni14 b/contrib/ipfilter/test/expected/ni14 deleted file mode 100644 index 5ad5a1b..0000000 --- a/contrib/ipfilter/test/expected/ni14 +++ /dev/null @@ -1,63 +0,0 @@ -4500 0030 5e11 4000 8006 ec0b c0a8 7101 7f00 0001 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 d44b 0000 0204 05b4 0101 0402 - -4500 002c 0000 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 - -4500 00c4 5e12 4000 8006 eb76 c0a8 7101 7f00 0001 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 954b 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00c4 0001 4000 4006 d6dd c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00d0 5e13 4000 8006 eb69 c0a8 7101 7f00 0001 05e7 06bb abf0 4b42 a564 6977 5018 fa54 5eb2 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 0048 0002 4000 4006 d758 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 - -4500 0040 5e14 4000 8006 ebf8 c0a8 7101 7f00 0001 05e7 06bb abf0 4bea a564 6997 5018 fa34 9abb 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff - -4500 0039 5e15 0000 802f 2bd6 c0a8 7101 7f00 0001 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 - -4500 0020 0003 0000 ff2f 5856 c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff - -4500 0028 0004 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 - -4500 0038 0005 0000 ff2f 583c c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 002f 0006 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -4500 003c 5e16 0000 802f 2bd2 c0a8 7101 7f00 0001 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 0036 5e17 0000 802f 2bd7 c0a8 7101 7f00 0001 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 003a 0007 0000 ff2f 5838 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 0032 0008 0000 ff2f 583f c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 - -4500 0040 5e18 4000 8006 ebf4 c0a8 7101 7f00 0001 05e7 06bb abf0 4c02 a564 6997 5018 fa34 9aa3 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff - -4500 0038 5e19 0000 802f 2bd3 c0a8 7101 7f00 0001 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 0009 0000 ff2f 5832 c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 5e1a 0000 802f 2bcc c0a8 7101 7f00 0001 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0044 000a 0000 ff2f 582b c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0030 5e1b 0000 802f 2bd9 c0a8 7101 7f00 0001 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 - -4500 002a 000b 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 - -4500 002c 000c 0000 ff2f 5841 c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 - -4500 0048 5e1c 0000 802f 2bc0 c0a8 7101 7f00 0001 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0042 000d 0000 ff2f 582a c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0030 5e1d 0000 802f 2bd7 c0a8 7101 7f00 0001 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 - -4500 0030 000e 0000 ff2f 583b c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 - -4500 002a 5e1e 0000 802f 2bdc c0a8 7101 7f00 0001 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 - -4500 0032 5e1f 0000 802f 2bd3 c0a8 7101 7f00 0001 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc - -4500 002a 000f 0000 ff2f 5840 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni15 b/contrib/ipfilter/test/expected/ni15 deleted file mode 100644 index 3820d56..0000000 --- a/contrib/ipfilter/test/expected/ni15 +++ /dev/null @@ -1,63 +0,0 @@ -4500 0030 0000 4000 8006 9772 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 - -4500 002c 69a6 4000 4006 6dd0 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 - -4500 00c4 0001 4000 8006 96dd c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00c4 69a7 4000 4006 6d37 c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00d0 0002 4000 8006 96d0 c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 0048 69a8 4000 4006 6db2 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 - -4500 0040 0003 4000 8006 975f c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff - -4500 0039 0004 0000 802f d73c c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 - -4500 0020 69a9 0000 ff2f eeaf c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff - -4500 0028 69aa 4000 4006 6dd0 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 - -4500 0038 69ab 0000 ff2f ee95 c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 002f 69ac 0000 ff2f ee9d c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -4500 003c 0005 0000 802f d738 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 0036 0006 0000 802f d73d c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 003a 69ad 0000 ff2f ee91 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 0032 69ae 0000 ff2f ee98 c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 - -4500 0040 0007 4000 8006 975b c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff - -4500 0038 0008 0000 802f d739 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 69af 0000 ff2f ee8b c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 0009 0000 802f d732 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0044 69b0 0000 ff2f ee84 c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0030 000a 0000 802f d73f c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 - -4500 002a 69b1 0000 ff2f ee9d c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 - -4500 002c 69b2 0000 ff2f ee9a c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 - -4500 0048 000b 0000 802f d726 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0042 69b3 0000 ff2f ee83 c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0030 000c 0000 802f d73d c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 - -4500 0030 69b4 0000 ff2f ee94 c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 - -4500 002a 000d 0000 802f d742 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 - -4500 0032 000e 0000 802f d739 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc - -4500 002a 69b5 0000 ff2f ee99 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni16 b/contrib/ipfilter/test/expected/ni16 deleted file mode 100644 index 2c34f5c..0000000 --- a/contrib/ipfilter/test/expected/ni16 +++ /dev/null @@ -1,63 +0,0 @@ -4500 0030 0000 4000 8006 9772 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 - -4500 002c 69a6 4000 4006 9376 c0a8 7103 0a02 0202 06bb 05e7 a564 68da abf0 4aa6 6012 8000 c8ee 0000 0204 05b4 - -4500 00c4 0001 4000 8006 96dd c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00c4 69a7 4000 4006 92dd c0a8 7103 0a02 0202 06bb 05e7 a564 68db abf0 4b42 5018 832c f475 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00d0 0002 4000 8006 96d0 c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 0048 69a8 4000 4006 9358 c0a8 7103 0a02 0202 06bb 05e7 a564 6977 abf0 4bea 5018 832c 5ca0 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 - -4500 0040 0003 4000 8006 975f c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff - -4500 0039 0004 0000 802f d73c c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 - -4500 0020 69a9 0000 ff2f 1456 c0a8 7103 0a02 0202 2081 880b 0000 4000 ffff ffff - -4500 0028 69aa 4000 4006 9376 c0a8 7103 0a02 0202 06bb 05e7 a564 6997 abf0 4c02 5010 832c db67 0000 - -4500 0038 69ab 0000 ff2f 143c c0a8 7103 0a02 0202 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 002f 69ac 0000 ff2f 1444 c0a8 7103 0a02 0202 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -4500 003c 0005 0000 802f d738 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 0036 0006 0000 802f d73d c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 003a 69ad 0000 ff2f 1438 c0a8 7103 0a02 0202 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 0032 69ae 0000 ff2f 143f c0a8 7103 0a02 0202 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 - -4500 0040 0007 4000 8006 975b c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff - -4500 0038 0008 0000 802f d739 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 69af 0000 ff2f 1432 c0a8 7103 0a02 0202 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 0009 0000 802f d732 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0044 69b0 0000 ff2f 142b c0a8 7103 0a02 0202 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0030 000a 0000 802f d73f c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 - -4500 002a 69b1 0000 ff2f 1444 c0a8 7103 0a02 0202 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 - -4500 002c 69b2 0000 ff2f 1441 c0a8 7103 0a02 0202 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 - -4500 0048 000b 0000 802f d726 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0042 69b3 0000 ff2f 142a c0a8 7103 0a02 0202 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0030 000c 0000 802f d73d c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 - -4500 0030 69b4 0000 ff2f 143b c0a8 7103 0a02 0202 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 - -4500 002a 000d 0000 802f d742 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 - -4500 0032 000e 0000 802f d739 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc - -4500 002a 69b5 0000 ff2f 1440 c0a8 7103 0a02 0202 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni17 b/contrib/ipfilter/test/expected/ni17 deleted file mode 100644 index 74eb4dd..0000000 --- a/contrib/ipfilter/test/expected/ni17 +++ /dev/null @@ -1,7 +0,0 @@ -< le0 ip #0 40(20) 6 10.2.2.5,2000 > 10.1.1.252,3128 -< le0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.2.252,3128 -< le0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.3.252,3128 -< le0 ip #0 40(20) 6 10.2.2.7,2001 > 10.1.3.252,3128 -< le0 ip #0 40(20) 6 10.2.2.8,2000 > 10.1.1.253,3128 -< le0 ip #0 40(20) 6 10.2.2.9,2000 > 10.1.2.253,3128 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni18 b/contrib/ipfilter/test/expected/ni18 deleted file mode 100644 index defc59c..0000000 --- a/contrib/ipfilter/test/expected/ni18 +++ /dev/null @@ -1,5 +0,0 @@ -< hme0 ip #0 40(20) 6 2.2.2.2,3000 > 1.1.1.1,80 -< hme0 ip #0 40(20) 6 2.2.2.2,3000 > 192.168.1.1,80 -> hme1 ip #0 40(20) 6 203.1.1.1,10000 > 4.5.6.7,80 -> hme1 ip #0 40(20) 6 10.1.1.2,5050 > 4.5.6.7,80 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni19 b/contrib/ipfilter/test/expected/ni19 deleted file mode 100644 index e55c75d..0000000 --- a/contrib/ipfilter/test/expected/ni19 +++ /dev/null @@ -1,43 +0,0 @@ -4500 0040 e3fc 4000 4006 40b5 0a01 0101 0a01 0104 03f1 0202 6523 90b2 0000 0000 b002 8000 a431 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 - -4500 0034 0000 4000 4006 fe13 0a01 0104 c0a8 7103 0202 03f1 915a a5c4 6523 90b3 8012 16d0 e89c 0000 0204 05b4 0101 0402 0103 0302 - -4500 0028 e3fd 4000 4006 40cc 0a01 0101 0a01 0104 03f1 0202 6523 90b3 915a a5c5 5010 832c e3b7 0000 - -4500 002d e3fe 4000 4006 40c6 0a01 0101 0a01 0104 03f1 0202 6523 90b3 915a a5c5 5018 832c 8242 0000 3130 3038 00 - -4500 0028 7ce5 4000 4006 813a 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90b8 5010 05b4 3a81 0000 - -4500 003c 1186 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000 a002 16d0 b8c0 0000 0204 05b4 0402 080a 0039 d924 0000 0000 0103 0302 - -4500 0040 e3ff 4000 4006 40b2 0a01 0101 0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3 b012 8000 452f 0000 0204 05b4 0103 0300 0101 080a 0000 0000 0039 d924 0402 0101 - -4500 0034 1188 4000 4006 ec8b 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8010 05b4 d99b 0000 0101 080a 0039 d925 0000 0000 - -4500 0030 e400 4000 4006 40c1 0a01 0101 0a01 0104 03f1 0202 6523 90b8 915a a5c5 5018 832c 3560 0000 6461 7272 656e 7200 - -4500 0028 7ce7 4000 4006 8138 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90c0 5010 05b4 3a79 0000 - -4500 0053 e401 4000 4006 409d 0a01 0101 0a01 0104 03f1 0202 6523 90c0 915a a5c5 5018 832c cce7 0000 6461 7272 656e 7200 7368 202d 6320 2265 6368 6f20 666f 6f20 3e26 313b 2065 6368 6f20 6261 7220 3e26 3222 00 - -4500 0028 7ce9 4000 4006 8136 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5010 05b4 3a4e 0000 - -4500 0029 7ceb 4000 4006 8133 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5018 05b4 3a45 0000 00 - -4500 0028 e403 4000 4006 40c6 0a01 0101 0a01 0104 03f1 0202 6523 90eb 915a a5c6 5010 832c e37e 0000 - -4500 002c 7ced 4000 4006 812e 0a01 0104 c0a8 7103 0202 03f1 915a a5c6 6523 90eb 5018 05b4 64c7 0000 666f 6f0a - -4500 0038 118a 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8018 05b4 00dd 0000 0101 080a 0039 dd6c 0000 0000 6261 720a - -4500 0028 7cef 4000 4006 8130 0a01 0104 c0a8 7103 0202 03f1 915a a5ca 6523 90eb 5011 05b4 3a48 0000 - -4500 0034 118c 4000 4006 ec87 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811 8011 05b4 d54e 0000 0101 080a 0039 dd6d 0000 0000 - -0 -0 -0 -0 -0 -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni2 b/contrib/ipfilter/test/expected/ni2 deleted file mode 100644 index 69a5272..0000000 --- a/contrib/ipfilter/test/expected/ni2 +++ /dev/null @@ -1,19 +0,0 @@ -4510 002c 0000 4000 3e06 78df 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 2ca8 0000 0204 05b4 - -4500 002c ce83 4000 7e06 606b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 - -4510 0028 0001 4000 3e06 78e2 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 29e3 0000 - -4500 005b cf83 4000 7e06 5f3c c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a - -4510 0028 0002 4000 3e06 78e1 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 - -4510 002e 0003 4000 3e06 78da 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 1c98 0000 0000 0000 0d0a - -4500 0048 e383 4000 7e06 4b4f c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 05dc e483 4000 7e06 44bb c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 0038 0004 4000 4001 76e4 0101 0101 c0a8 0133 0304 444f 0000 05a0 4500 05dc e483 4000 7e06 4ebb c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni20 b/contrib/ipfilter/test/expected/ni20 deleted file mode 100644 index 913ef0b..0000000 --- a/contrib/ipfilter/test/expected/ni20 +++ /dev/null @@ -1,69 +0,0 @@ -4500 0040 e3fc 4000 4006 f362 c0a8 7103 c0a8 7104 03f1 0202 6523 90b2 0000 0000 b002 8000 56df 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 - -4500 0034 0000 4000 4006 fe13 0a01 0104 c0a8 7103 0202 03f1 915a a5c4 6523 90b3 8012 16d0 e89c 0000 0204 05b4 0101 0402 0103 0302 - -4500 0028 e3fd 4000 4006 f379 c0a8 7103 c0a8 7104 03f1 0202 6523 90b3 915a a5c5 5010 832c 9665 0000 - -4500 002d e3fe 4000 4006 f373 c0a8 7103 c0a8 7104 03f1 0202 6523 90b3 915a a5c5 5018 832c 34f0 0000 3130 3038 00 - -4500 0028 7ce5 4000 4006 813a 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90b8 5010 05b4 3a81 0000 - -4500 003c 1186 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000 a002 16d0 b8c0 0000 0204 05b4 0402 080a 0039 d924 0000 0000 0103 0302 - -4500 0040 e3ff 4000 4006 f35f c0a8 7103 c0a8 7104 03f0 03ff 66e5 b810 91d4 c8a3 b012 8000 f7dc 0000 0204 05b4 0103 0300 0101 080a 0000 0000 0039 d924 0402 0101 - -4500 0034 1188 4000 4006 ec8b 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8010 05b4 d99b 0000 0101 080a 0039 d925 0000 0000 - -4500 0030 e400 4000 4006 f36e c0a8 7103 c0a8 7104 03f1 0202 6523 90b8 915a a5c5 5018 832c e80d 0000 6461 7272 656e 7200 - -4500 0028 7ce7 4000 4006 8138 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90c0 5010 05b4 3a79 0000 - -4500 0053 e401 4000 4006 f34a c0a8 7103 c0a8 7104 03f1 0202 6523 90c0 915a a5c5 5018 832c 7f95 0000 6461 7272 656e 7200 7368 202d 6320 2265 6368 6f20 666f 6f20 3e26 313b 2065 6368 6f20 6261 7220 3e26 3222 00 - -4500 0028 7ce9 4000 4006 8136 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5010 05b4 3a4e 0000 - -4500 0029 7ceb 4000 4006 8133 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5018 05b4 3a45 0000 00 - -4500 0028 e403 4000 4006 f373 c0a8 7103 c0a8 7104 03f1 0202 6523 90eb 915a a5c6 5010 832c 962c 0000 - -4500 002c 7ced 4000 4006 812e 0a01 0104 c0a8 7103 0202 03f1 915a a5c6 6523 90eb 5018 05b4 64c7 0000 666f 6f0a - -4500 0038 118a 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8018 05b4 00dd 0000 0101 080a 0039 dd6c 0000 0000 6261 720a - -4500 0028 7cef 4000 4006 8130 0a01 0104 c0a8 7103 0202 03f1 915a a5ca 6523 90eb 5011 05b4 3a48 0000 - -4500 0034 118c 4000 4006 ec87 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811 8011 05b4 d54e 0000 0101 080a 0039 dd6d 0000 0000 - -0 -0 -0 -0 -0 -0 -List of active MAP/Redirect filters: -rdr bge0 10.1.1.4/32 port 514 -> 192.168.113.4/32 port 514 tcp proxy rcmd - -List of active sessions: -MAP 192.168.113.4 1023 <- -> 10.1.1.4 1023 [192.168.113.3 1008] -RDR 192.168.113.4 514 <- -> 10.1.1.4 514 [192.168.113.3 1009] - proxy active - -Hostmap table: -192.168.113.4,192.168.113.3 -> 10.1.1.4,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -5 block in all -1 pass in quick on bge0 proto tcp from any to any port = 514 flags S/FSRPAU keep state -Rules configured (set 0, out) -2 block out all -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni21 b/contrib/ipfilter/test/expected/ni21 deleted file mode 100644 index 53e64a5..0000000 --- a/contrib/ipfilter/test/expected/ni21 +++ /dev/null @@ -1,6 +0,0 @@ -> eri0 ip #0 20(20) 0 4.4.4.4 > 3.3.3.3 -0 -< lan0 ip #0 20(20) 0 3.3.3.3 > 2.2.2.2 -> eri0 ip #0 20(20) 0 4.4.4.4 > 3.3.3.3 -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni23 b/contrib/ipfilter/test/expected/ni23 deleted file mode 100644 index 586373c..0000000 --- a/contrib/ipfilter/test/expected/ni23 +++ /dev/null @@ -1,37 +0,0 @@ -> ppp0 ip #0 28(20) 17 4.4.4.4,6700 > 2.2.2.2,4500 -0 -< hme0 ip #0 28(20) 17 2.2.2.2,4500 > 3.3.3.1,6700 -> bge0 ip #0 28(20) 17 1.1.2.3,4500 > 3.3.3.1,6700 -List of active MAP/Redirect filters: -rdr le0,bge0 1.1.0.0/16 -> 2.2.2.2/32 ip -map hme0,ppp0 3.3.3.0/24 -> 4.4.4.4/32 - -List of active sessions: -MAP 3.3.3.1 6700 <- -> 4.4.4.4 6700 [2.2.2.2 4500] -RDR 2.2.2.2 4500 <- -> 1.1.2.3 4500 [3.3.3.1 6700] - -Hostmap table: -3.3.3.1,2.2.2.2 -> 4.4.4.4,0.0.0.0 (use = 1) -List of active state sessions: -4:udp src:3.3.3.1,6700 dst:2.2.2.2,4500 24 - FWD: IN pkts 1 bytes 28 OUT pkts 1 bytes 28 - REV: IN pkts 1 bytes 28 OUT pkts 1 bytes 28 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[le0],X[hme0] out X[ppp0],X[bge0] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 block in all -1 pass in on le0,hme0 to ppp0:3.3.3.254 out-via ppp0,bge0 inet proto udp from any to any keep state -Rules configured (set 0, out) -0 block out all -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni3 b/contrib/ipfilter/test/expected/ni3 deleted file mode 100644 index 107d5d9..0000000 --- a/contrib/ipfilter/test/expected/ni3 +++ /dev/null @@ -1,7 +0,0 @@ -4500 003c 0000 4000 ff06 67a8 0606 0606 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 - -4500 0058 809a 0000 ff01 3101 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni4 b/contrib/ipfilter/test/expected/ni4 deleted file mode 100644 index 627aa19..0000000 --- a/contrib/ipfilter/test/expected/ni4 +++ /dev/null @@ -1,7 +0,0 @@ -4500 003c 0000 4000 ff06 67a8 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0303 acac 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 - -4500 0058 809a 0000 ff01 3101 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni5 b/contrib/ipfilter/test/expected/ni5 deleted file mode 100644 index 14d9837..0000000 --- a/contrib/ipfilter/test/expected/ni5 +++ /dev/null @@ -1,96 +0,0 @@ -4500 002c 0000 4000 ff06 02fc 0101 0101 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 f5a2 0000 0204 05b4 - -4500 002c ffdd 4000 ef06 5374 96cb e002 c0a8 0103 0015 8032 3786 76c4 bd6b c9c9 6012 269c 8369 0000 0204 0584 - -4500 0028 0001 4000 ff06 02ff 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000 - -ipf_p_ftp_servert_valid:i(0) < 5 -4500 006f ffde 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 76c5 bd6b c9c9 5018 269c 967e 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 4654 5064 2053 6572 7665 7220 2866 7265 6520 6564 7563 6174 696f 6e61 6c20 6c69 6365 6e73 6529 2072 6561 6479 2e0d 0a - -4500 0028 0002 4000 ff06 02fe 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 770c 5010 269c 5a59 0000 - -4500 00c7 ffdf 4000 ef06 52d7 96cb e002 c0a8 0103 0015 8032 3786 770c bd6b c9c9 5018 269c 1087 0000 3232 302d 0d0a 3232 302d 4d61 696e 7461 696e 6564 2062 7920 5253 5353 2061 6e64 2052 5350 4153 2049 5420 5374 6166 6620 2870 7265 7669 6f75 736c 7920 6b6e 6f77 6e20 6173 2043 6f6f 6d62 7320 436f 6d70 7574 696e 6720 556e 6974 290d 0a32 3230 2d41 6e79 2070 726f 626c 656d 7320 636f 6e74 6163 7420 6674 706d 6173 7465 7240 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 750d 0a32 3230 2d0d 0a32 3230 200d 0a - -4500 0028 0003 4000 ff06 02fd 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5010 269c 59ba 0000 - -4500 0038 0004 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5018 269c d1c5 0000 5553 4552 2061 6e6f 6e79 6d6f 7573 0d0a - -4500 0028 ffe0 4000 ef06 5375 96cb e002 c0a8 0103 0015 8032 3786 77ab bd6b c9d9 5010 269c 9a00 0000 - -4500 006c ffe1 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 77ab bd6b c9d9 5018 269c b00f 0000 3333 3120 4775 6573 7420 6c6f 6769 6e20 6f6b 2c20 7365 6e64 2079 6f75 7220 636f 6d70 6c65 7465 2065 2d6d 6169 6c20 6164 6472 6573 7320 6173 2070 6173 7377 6f72 642e 0d0a - -4500 0028 0005 4000 ff06 02fb 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5010 269c 5966 0000 - -4500 0036 0006 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5018 269c 373f 0000 5041 5353 2061 7661 6c6f 6e40 0d0a - -ipf_p_ftp_servert_valid:i(0) < 5 -4500 005f ffe2 4000 ef06 533c 96cb e002 c0a8 0103 0015 8032 3786 77ef bd6b c9e7 5018 269c 895e 0000 3233 302d 596f 7520 6172 6520 7573 6572 2023 3420 6f66 2035 3020 7369 6d75 6c74 616e 656f 7573 2075 7365 7273 2061 6c6c 6f77 6564 2e0d 0a - -4500 0028 0007 4000 ff06 02f9 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7826 5010 269c 5921 0000 - -4500 0099 ffe3 4000 ef06 5301 96cb e002 c0a8 0103 0015 8032 3786 7826 bd6b c9e7 5018 269c d399 0000 3233 302d 0d0a 3233 302d 0d0a 3233 302d 4869 2e20 2057 6527 7265 2063 6c65 616e 696e 6720 7570 2e20 2041 6e79 2066 6565 6462 6163 6b20 6d6f 7374 2077 656c 636f 6d65 2e20 3130 2041 7567 2030 300d 0a32 3330 2d0d 0a32 3330 204c 6f67 6765 6420 696e 2061 6e6f 6e79 6d6f 7573 6c79 2e0d 0a - -4500 0028 0008 4000 ff06 02f8 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5010 269c 58b0 0000 - -4500 0030 0009 4000 ff06 02ef 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5018 269c 86ae 0000 5459 5045 2049 0d0a - -4500 0038 ffe4 4000 ef06 5361 96cb e002 c0a8 0103 0015 8032 3786 7897 bd6b c9ef 5018 269c 5fae 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a - -4500 0028 000a 4000 ff06 02f6 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5010 269c 5898 0000 - -4500 003d 000b 4000 ff06 02e0 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5018 269c 4b67 0000 504f 5254 2031 2c31 2c31 2c31 2c31 3238 2c35 310d 0a - -4500 0046 ffe5 4000 ef06 5352 96cb e002 c0a8 0103 0015 8032 3786 78a7 bd6b ca0c 5018 269c dbc3 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 6675 6c2e 0d0a - -4500 0030 000c 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b ca04 3786 78c5 5018 269c 866b 0000 5459 5045 2041 0d0a - -4500 0038 ffe6 4000 ef06 535f 96cb e002 c0a8 0103 0015 8032 3786 78c5 bd6b ca14 5018 269c 5f5b 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a - -4500 002e 000d 4000 ff06 02ed 0101 0101 96cb e002 8032 0015 bd6b ca0c 3786 78d5 5018 269c a994 0000 4e4c 5354 0d0a - -4500 002c ffe7 4000 ef06 536a 96cb e002 c0a8 0103 0014 8033 d9f8 11d4 0000 0000 6002 2238 d190 0000 0204 0584 - -4500 002c 000e 4000 ff06 02ee 0101 0101 96cb e002 8033 0014 bd78 5c12 d9f8 11d5 6012 02f8 96de 0000 0204 0584 - -4500 0028 ffe8 4000 ef06 536d 96cb e002 c0a8 0103 0014 8033 d9f8 11d5 bd78 5c13 5010 269c cb1d 0000 - -4500 005d ffe9 4000 ef06 5337 96cb e002 c0a8 0103 0015 8032 3786 78d5 bd6b ca1a 5018 269c eed0 0000 3135 3020 4f70 656e 696e 6720 4153 4349 4920 6d6f 6465 2064 6174 6120 636f 6e6e 6563 7469 6f6e 2066 6f72 202f 6269 6e2f 6c73 2e0d 0a - -4500 0028 000f 4000 ff06 02f1 0101 0101 96cb e002 8033 0014 bd78 5c13 d9f8 11d5 5010 6348 4e1b 0000 - -4500 003d 0010 4000 ff06 02db 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 78d5 5018 269c 4a16 0000 504f 5254 2031 2c31 2c31 2c31 2c31 3238 2c35 320d 0a - -4500 0046 ffea 4000 ef06 534d 96cb e002 c0a8 0103 0015 8032 3786 78d5 bd6b ca37 5018 269c db6a 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 6675 6c2e 0d0a - -4500 0030 0011 4000 ff06 02e7 0101 0101 96cb e002 8032 0015 bd6b ca27 3786 78f3 5018 269c 861a 0000 5459 5045 2041 0d0a - -4500 0038 ffeb 4000 ef06 535a 96cb e002 c0a8 0103 0015 8032 3786 78f3 bd6b ca3f 5018 269c 5ef2 0000 3230 3020 5479 7065 206f 6b61 793e 0d0a - -4500 002e 0012 4000 ff06 02e8 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 7903 5018 269c a943 0000 4e4c 5354 0d0a - -4500 002c ffec 4000 ef06 5365 96cb e002 c0a8 0103 0014 8034 d9f8 11d4 0000 0000 6002 2238 d18f 0000 0204 0584 - -4500 002c 0013 4000 ff06 02e9 0101 0101 96cb e002 8034 0014 bd78 5c12 d9f8 11d5 6012 02f8 96dd 0000 0204 0584 - -4500 0028 ffec 4000 ef06 5369 96cb e002 c0a8 0103 0014 8034 d9f8 11d4 0000 0000 5010 2238 e90d 0000 - -0 -0 -0 -0 -0 -0 -4500 0040 fff0 4000 ef06 534d 96cb e002 c0a8 0103 0015 8032 3786 7903 bd6b ca3f 5018 269c 7c80 0000 3232 3620 4c69 7374 696e 6720 636f 6d70 6c65 7465 642e 0d0a - -4500 0028 0014 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 791b 5010 269c 57e4 0000 - -4500 002e 0015 4000 ff06 02e5 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 791b 5018 269c b022 0000 5155 4954 0d0a - -4500 0036 fff2 4000 ef06 5355 96cb e002 c0a8 0103 0015 8032 3786 791b bd6b ca45 5018 269c a936 0000 3232 3120 476f 6f64 6279 652e 0d0a - -4500 0028 0016 4000 ff06 02ea 0101 0101 96cb e002 8032 0015 bd6b ca35 3786 7929 5011 269c 57cf 0000 - -0 -0 -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni6 b/contrib/ipfilter/test/expected/ni6 deleted file mode 100644 index e70412b..0000000 --- a/contrib/ipfilter/test/expected/ni6 +++ /dev/null @@ -1,63 +0,0 @@ -< nf0 ip #52618 84(20) 17 192.168.6.1,32885 > 192.168.7.1,111 -> qfe0 ip #0 84(20) 17 192.168.7.2,32885 > 192.168.7.1,111 -< qfe0 ip #52611 56(20) 17 192.168.7.1,111 > 192.168.6.1,32885 -> nf0 ip #1 56(20) 17 192.168.6.2,111 > 192.168.6.1,32885 -< nf0 ip #54694 68(20) 17 192.168.6.1,32991 > 192.168.7.1,2049 -> qfe0 ip #2 68(20) 17 192.168.7.2,32991 > 192.168.7.1,2049 -< qfe0 ip #0 52(20) 17 192.168.7.1,2049 > 192.168.6.1,32991 -> nf0 ip #3 52(20) 17 192.168.6.2,2049 > 192.168.6.1,32991 -List of active MAP/Redirect filters: -rdr nf0 192.168.6.2/32 port 111 -> 192.168.7.1/32 port 111 udp proxy rpcbu -rdr nf0 192.168.6.2/32 port 111 -> 192.168.7.1/32 port 111 tcp proxy rpcbt -map qfe0 192.168.6.0/24 -> 192.168.7.2/32 - -List of active sessions: -MAP 192.168.6.1 32991 <- -> 192.168.7.2 32991 [192.168.7.1 2049] -RDR 192.168.7.1 2049 <- -> 192.168.6.2 2049 [192.168.6.1 32991] -RDR CLONE 192.168.7.1 2049 <- -> 192.168.6.2 2049 [192.168.6.1 0] -MAP 192.168.6.1 32885 <- -> 192.168.7.2 32885 [192.168.7.1 111] -RDR 192.168.7.1 111 <- -> 192.168.6.2 111 [192.168.6.1 32885] - proxy active - -Hostmap table: -192.168.6.1,192.168.7.1 -> 192.168.7.2,0.0.0.0 (use = 2) -List of active state sessions: -4:udp src:192.168.6.1,32991 dst:192.168.7.1,2049 24 - FWD: IN pkts 2 bytes 96 OUT pkts 1 bytes 68 - REV: IN pkts 1 bytes 52 OUT pkts 1 bytes 52 - tag 0 pass 0x502 = pass in quick keep state - interfaces: in X[nf0],X[qfe0] out X[qfe0],X[nf0] - Sync status: not synchronized -4:udp src:192.168.6.1,* dst:192.168.7.1,2049 240 CLONE - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x502 = pass in quick keep state - interfaces: in X[nf0],X[] out X[],X[] - Sync status: not synchronized -4:udp src:192.168.6.1,32885 dst:192.168.7.1,111 24 - FWD: IN pkts 1 bytes 84 OUT pkts 1 bytes 84 - REV: IN pkts 1 bytes 56 OUT pkts 1 bytes 56 - tag 0 pass 0x2008502 = pass in quick keep state - interfaces: in X[nf0],X[qfe0] out X[qfe0],X[nf0] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -0 pass in quick on nf0 proto tcp from any to any port = 111 flags S/FSRPAU keep state -1 pass in quick on nf0 proto udp from any to any port = 111 keep state -0 block return-rst in log quick on nf0 proto tcp from any to any -0 block in log quick on nf0 inet from 192.168.7.0/24 to any -0 block return-rst in log quick on qfe0 proto tcp from any to any -0 block in log quick on qfe0 inet from 192.168.6.0/24 to any -Rules configured (set 0, out) -0 block out log quick on qfe0 inet from 192.168.7.0/24 to any -0 block out log quick on nf0 inet from 192.168.6.0/24 to any -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni7 b/contrib/ipfilter/test/expected/ni7 deleted file mode 100644 index 38c39ab..0000000 --- a/contrib/ipfilter/test/expected/ni7 +++ /dev/null @@ -1,5 +0,0 @@ -4500 0028 4706 4000 0111 1eac 0404 0404 0606 0606 afc9 829e 0014 6308 0402 0000 3be5 468d 000a cfc3 - -4500 0038 0000 0000 ff01 afb9 0202 0202 0404 0404 0b00 f91c 0000 0000 4500 0028 4706 4000 0111 26b4 0404 0404 0202 0202 afc9 829e 0014 c966 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni8 b/contrib/ipfilter/test/expected/ni8 deleted file mode 100644 index e0d5182..0000000 --- a/contrib/ipfilter/test/expected/ni8 +++ /dev/null @@ -1,9 +0,0 @@ -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 - -4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0002 0000 ff01 abb3 0303 0303 0505 0505 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9d58 0000 0001 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni9 b/contrib/ipfilter/test/expected/ni9 deleted file mode 100644 index 1eb6fbc..0000000 --- a/contrib/ipfilter/test/expected/ni9 +++ /dev/null @@ -1,9 +0,0 @@ -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 adb7 0303 0303 0404 0404 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 - -4500 0058 0001 0000 ff01 ad96 0303 0303 0404 0404 0303 0735 0000 0000 4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0002 0000 ff01 abb3 0303 0303 0505 0505 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9d58 0000 0001 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/p1 b/contrib/ipfilter/test/expected/p1 deleted file mode 100644 index 58dc681..0000000 --- a/contrib/ipfilter/test/expected/p1 +++ /dev/null @@ -1,30 +0,0 @@ -nomatch -pass -nomatch -nomatch -nomatch -pass -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -table role=ipf type=tree number=100 - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; ef00::5/128; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in from pool/100 to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p10 b/contrib/ipfilter/test/expected/p10 deleted file mode 100644 index 9f09502..0000000 --- a/contrib/ipfilter/test/expected/p10 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.9,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.9 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.5 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.5 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.9 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.4 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.4 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.9 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.2 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.9 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.2 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p11 b/contrib/ipfilter/test/expected/p11 deleted file mode 100644 index e907fbb..0000000 --- a/contrib/ipfilter/test/expected/p11 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.5,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.5 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.5 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.5 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.5 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.5 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.5 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.5 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.5 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.5 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.5 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p12 b/contrib/ipfilter/test/expected/p12 deleted file mode 100644 index d097d51..0000000 --- a/contrib/ipfilter/test/expected/p12 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.5,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.5 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.9 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.9 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.4 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.4 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.9 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.4 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.4 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.5 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.2 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p13 b/contrib/ipfilter/test/expected/p13 deleted file mode 100644 index aa529ea..0000000 --- a/contrib/ipfilter/test/expected/p13 +++ /dev/null @@ -1,30 +0,0 @@ -nomatch -pass -nomatch -nomatch -nomatch -pass -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -table role=all type=tree number=100 - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; ef00::5/128; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in from pool/100 to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p2 b/contrib/ipfilter/test/expected/p2 deleted file mode 100644 index 5388742..0000000 --- a/contrib/ipfilter/test/expected/p2 +++ /dev/null @@ -1,35 +0,0 @@ -block -nomatch -pass -nomatch -nomatch -nomatch -nomatch -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -# 'anonymous' table refs 2 -table role=ipf type=hash number=2147483650 size=3 - { 127.0.0.1/32; 4.4.0.0/16; }; -# 'anonymous' table refs 2 -table role=ipf type=hash number=2147483649 size=3 - { 127.0.0.1/32; 4.4.0.0/16; }; -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 block in from hash/2147483650 to any -Rules configured (set 0, out) -2 pass out from hash/2147483649 to any -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p3 b/contrib/ipfilter/test/expected/p3 deleted file mode 100644 index c1e0343..0000000 --- a/contrib/ipfilter/test/expected/p3 +++ /dev/null @@ -1,45 +0,0 @@ -pass -nomatch -nomatch -nomatch -nomatch -pass -block -nomatch -nomatch -pass -nomatch -block -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -group-map out role=ipf number=2010 size=5 - { 2.2.2.2/32, group=2020; 4.4.0.0/16, group=2020; 5.0.0.0/8, group=2040; }; -group-map in role=ipf number=1010 size=3 - { 1.1.1.1/32, group=1020; 3.3.0.0/16, group=1030; }; -List of groups configured (set 0) -Dev.0. Group 1020 Ref 2 Flags 0x8000 -2 pass in all group 1020 -Dev.0. Group 1030 Ref 2 Flags 0x8000 -2 block in all group 1030 -Dev.0. Group 2020 Ref 3 Flags 0x4000 -4 pass out all group 2020 -Dev.0. Group 2040 Ref 2 Flags 0x4000 -2 block out all group 2040 -List of groups configured (set 1) -Rules configured (set 0, in) -6 call now srcgrpmap/1010 in all -Rules configured (set 0, out) -6 call now dstgrpmap/2010 out all -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p4 b/contrib/ipfilter/test/expected/p4 deleted file mode 100644 index e7aa73f..0000000 --- a/contrib/ipfilter/test/expected/p4 +++ /dev/null @@ -1,38 +0,0 @@ -< anon0 ip #0 20(20) 0 127.0.0.1 > 127.0.0.1 -< anon0 ip #0 20(20) 0 1.1.1.1 > 1.2.1.1 -> anon0 ip #0 20(20) 0 127.0.0.1 > 127.0.0.1 -> anon0 ip #0 20(20) 0 1.2.3.4 > 1.2.1.1 -< anon0 ip #0 20(20) 0 2.3.0.1 > 1.2.1.1 -< anon0 ip #0 20(20) 0 2.2.2.1 > 1.2.1.1 -< anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.1 -15 -> anon0 ip #0 20(20) 0 1.2.3.4 > 1.2.1.2 -> anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.1 -> anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.3 -> anon0 ip #0 20(20) 0 4.4.1.1 > 1.2.1.1 -List of active MAP/Redirect filters: -map * from pool/100 to 0/0 -> 1.2.3.4/32 - -List of active sessions: -MAP 2.2.2.1 <- -> 1.2.3.4 [1.2.1.2] -MAP 1.1.1.1 <- -> 1.2.3.4 [1.2.1.1] - -Hostmap table: -2.2.2.1,1.2.1.2 -> 1.2.3.4,0.0.0.0 (use = 1) -1.1.1.1,1.2.1.1 -> 1.2.3.4,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -table role=nat type=tree number=100 - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p5 b/contrib/ipfilter/test/expected/p5 deleted file mode 100644 index b56c3bc..0000000 --- a/contrib/ipfilter/test/expected/p5 +++ /dev/null @@ -1,21 +0,0 @@ -nomatch -pass -nomatch -nomatch -nomatch -pass -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -table role=ipf type=tree name=letters - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p6 b/contrib/ipfilter/test/expected/p6 deleted file mode 100644 index 413f94b..0000000 --- a/contrib/ipfilter/test/expected/p6 +++ /dev/null @@ -1,24 +0,0 @@ -block -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -table role=ipf type=tree name=microsoft - { 131.107.0.0/16; 192.92.90.0/24; 198.105.232.0/22; 204.231.58.0/24; 204.140.77.0/24; 204.140.80.0/22; 199.60.28.0/24; 199.103.90.0/23; 199.103.122.0/24; 204.79.101.0/24; 192.237.67.0/24; 198.137.97.0/24; 204.79.135.0/24; 204.79.179.0/24; 204.79.180.0/23; 204.79.188.0/24; 204.79.7.0/24; 204.79.27.0/24; 198.180.74.0/23; 204.231.236.0/24; 205.163.63.0/24; 205.163.62.0/24; 205.163.144.0/20; 205.248.50.0/23; 205.248.72.0/24; 205.248.212.0/22; 205.248.228.0/24; 205.248.235.0/24; 204.231.76.0/24; 204.231.192.0/24; 207.78.80.0/24; 207.78.81.0/24; 207.78.82.0/24; 207.117.3.0/24; 207.18.117.0/24; 208.139.27.0/24; 209.28.213.0/24; 207.209.68.0/24; 204.95.96.0/20; 207.158.93.192/27; 207.240.123.192/27; 208.26.205.0/24; 192.197.157.0/24; 204.133.231.0/24; 216.72.96.0/22; 207.229.166.152/29; 204.95.149.0/24; 209.192.213.72/29; 206.73.203.0/24; 206.73.118.0/24; 208.45.54.16/29; 208.45.54.8/29; 206.73.31.0/24; 63.161.50.128/25; 63.161.50.0/25; 207.240.8.224/28; 208.45.89.248/29; 206.182.69.0/24; 206.182.240.0/24; 206.182.241.0/24; 206.73.67.0/24; 206.182.251.0/24; 206.182.247.0/24; 206.182.236.0/24; 63.236.198.64/29; 63.236.198.152/29; 165.121.253.232/29; 63.236.170.64/29; 63.236.186.64/29; 63.236.187.104/29; 63.236.187.128/29; 63.236.187.160/29; 199.2.137.0/24; 216.222.104.224/28; 63.151.87.64/29; 64.77.82.96/29; 64.77.93.80/28; 65.52.0.0/14; 207.46.0.0/16; 204.182.144.0/20; 206.107.34.0/24; 205.240.158.0/23; 204.79.252.0/24; 64.200.211.16/28; 12.178.163.0/27; 69.44.126.80/28; 63.173.42.128/25; 12.28.108.0/25; 65.170.29.0/29; 67.132.133.96/29; 8.6.176.0/24; 63.148.123.240/29; 64.41.193.0/24; 64.85.70.32/28; 64.85.81.96/29; 64.85.81.104/29; 216.32.168.224/27; 206.79.74.32/28; 216.32.175.224/27; 216.32.180.0/22; 216.33.229.224/27; 216.33.236.0/22; 216.33.240.0/22; 216.32.240.0/22; 216.34.51.0/24; 209.1.112.0/24; 209.1.113.0/24; 209.1.15.0/24; 216.34.53.176/28; 216.35.8.224/28; 209.185.128.0/22; 65.114.175.128/27; 64.15.229.96/27; 64.15.177.0/24; 64.15.170.192/29; 209.143.238.0/24; 64.15.178.0/24; 66.35.209.120/29; 66.35.211.128/26; 66.35.208.48/28; 216.33.148.0/22; 216.35.66.88/29; 12.230.32.160/29; 12.53.124.0/27; 12.232.18.96/27; 12.190.158.0/24; 12.71.196.32/28; 209.240.192.0/19; 70.37.128.0/23; 70.37.135.0/24; 12.49.87.192/26; 74.93.205.144/29; 74.93.205.152/29; 74.93.206.64/29; 70.89.139.120/29; 206.71.119.0/24; 206.71.117.0/24; 206.71.118.0/24; 209.154.155.112/29; 65.68.62.152/29; 67.39.208.168/29; 65.242.67.0/24; 204.71.191.0/24; 63.194.155.144/29; 66.136.85.192/29; 64.124.184.72/29; 216.200.206.0/24; 63.80.93.0/25; 67.192.225.208/28; 69.74.162.0/24; 65.221.5.0/24; 65.248.85.0/24; 199.243.157.192/27; 199.243.157.112/29; 65.194.210.224/27; 208.194.139.0/24; 208.204.49.128/25; 208.205.26.0/24; 208.217.184.0/22; 208.222.172.0/24; 208.224.200.64/27; 208.229.100.0/23; 208.241.19.0/28; 208.241.19.16/28; 208.241.9.224/28; 208.244.108.0/28; 208.245.16.0/27; 208.249.17.160/28; 63.104.216.0/25; 63.69.245.0/24; 68.90.141.72/29; 63.198.123.160/29; 68.248.48.64/29; 68.248.48.72/29; 99.49.8.248/29; 65.38.172.72/29; 65.38.172.96/28; 75.149.174.16/29; 75.151.100.240/28; 64.81.8.96/27; 67.112.255.144/29; 63.240.201.176/28; 206.16.209.208/28; 63.240.195.208/28; 206.16.204.64/28; 206.16.223.0/24; 63.240.216.0/22; 63.240.220.0/22; 206.16.246.24/29; 63.240.195.192/28; 206.16.224.160/27; 67.192.39.48/28; 72.32.240.160/28; 72.32.201.152/29; 67.39.81.152/29; 69.20.127.32/29; 216.52.28.0/24; 70.42.230.0/23; 63.251.97.0/24; 67.120.132.128/29; 67.120.132.152/29; 67.120.132.192/28; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 block in from pool/microsoft to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p7 b/contrib/ipfilter/test/expected/p7 deleted file mode 100644 index 89bfc11..0000000 --- a/contrib/ipfilter/test/expected/p7 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.4,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.4 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.2 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.9 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.5 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.4 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.2 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.9 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.5 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.4 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.2 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p9 b/contrib/ipfilter/test/expected/p9 deleted file mode 100644 index 89bfc11..0000000 --- a/contrib/ipfilter/test/expected/p9 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.4,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.4 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.2 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.9 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.5 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.4 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.2 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.9 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.5 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.4 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.2 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- |