diff options
| author | cy <cy@FreeBSD.org> | 2013-09-21 14:23:20 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2013-09-21 14:23:20 +0000 |
| commit | 1f79bda80fc99a9bea37dc83f80019be39c33c5a (patch) | |
| tree | 3915c70585141494037a8c4fd909db7ea85a2aac /contrib/ipfilter/test | |
| parent | b3f0452e3485d31d295010234a8951b1129a6f0b (diff) | |
| download | FreeBSD-src-1f79bda80fc99a9bea37dc83f80019be39c33c5a.zip FreeBSD-src-1f79bda80fc99a9bea37dc83f80019be39c33c5a.tar.gz | |
Remove redundant files.
Approved by: glebius (mentor)
Approved by: re (blanket)
Diffstat (limited to 'contrib/ipfilter/test')
468 files changed, 0 insertions, 17627 deletions
diff --git a/contrib/ipfilter/test/Makefile b/contrib/ipfilter/test/Makefile deleted file mode 100644 index 8918311..0000000 --- a/contrib/ipfilter/test/Makefile +++ /dev/null @@ -1,520 +0,0 @@ -# -# (C)opyright 1993-1996 by Darren Reed. -# -# See the IPFILTER.LICENCE file for details on licencing. -# -POOLDEP=../ip_lookup.c ../ip_lookup.h ../ip_pool.c ../ip_pool.h \ - ../ip_htable.c ../ip_htable.h ../ip_dstlist.c ../ip_dstlist.h \ - ../tools/ippool_y.y -BINDEST=/usr/local/bin -SBINDEST=/sbin -MANDIR=/usr/share/man -all: expected.d results tests - -expected.d: - (cd expected; make) - -results: - mkdir -p results - -tests: ipf nat logtests ipv6 pools - -ipf: patests ftests - -nat: intests ntests nitests - -first: - -mkdir -p results - -# Filtering tests -ftests: f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f15 f16 f17 f18 f19 f20 f21 f22 f24 f25 f26 f27 f28 f29 f30 - -# Rule parsing tests -patests: i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 i12 i13 i14 i15 i16 i17 i18 i19 \ - i20 i21 i22 i23 - -ntests: n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n100 n101 n102 n103 n104 n105 n106 n200 - -ntests6: n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 - -nitests: ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9 ni10 ni11 ni12 ni13 ni14 ni15 \ - ni16 ni17 ni18 ni19 ni20 ni21 ni23 - -intests: in1 in2 in3 in4 in5 in6 in7 in8 in100 in101 in102 - -logtests: l1 - -pools: p1 p2 p3 p4 p5 p6 p7 p9 p10 p11 p12 p13 ip1 ip2 ip3 - -ipv6: ipv6.1 ipv6.2 ipv6.3 ipv6.4 ipv6.5 ipv6.6 ntests6 - -bpf: bpf1 bpf-f1 - -f1: expected/f1 input/f1 regress/f1 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f2: expected/f2 input/f2 regress/f2 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f3: expected/f3 input/f3 regress/f3 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f4: expected/f4 input/f4 regress/f4 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f5: expected/f5 input/f5 regress/f5 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f6: expected/f6 input/f6 regress/f6 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f7: expected/f7 input/f7 regress/f7 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f8: expected/f8 input/f8 regress/f8 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f9: expected/f9 input/f9 regress/f9 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f10: expected/f10 input/f10 regress/f10 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f11: expected/f11 input/f11 regress/f11 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f12: expected/f12 input/f12 regress/f12 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f13: expected/f13 input/f13 regress/f13 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f14: expected/f14 input/f14 regress/f14 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f19: expected/f15 input/f15 regress/f15 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f15: expected/f15 input/f15 regress/f15 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f16: expected/f16 input/f16 regress/f16 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f17: expected/f17 input/f17 regress/f17 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f18: expected/f18 input/f18 regress/f18 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f20: expected/f20 input/f20 regress/f20 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f21: expected/f21 input/f21 regress/f21 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f22: expected/f22 input/f22 regress/f22 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f24: expected/f24 input/f24 regress/f24 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f25: expected/f25 input/f25 regress/f25 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f26: expected/f26 input/f26 regress/f26 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f27: expected/f27 input/f27 regress/f27 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f28: expected/f28 input/f28 regress/f28.ipf regress/f28.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -f29: expected/f29 input/f29 regress/f29.ipf regress/f29.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -f30: expected/f30 input/f30 regress/f30 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -i1: expected/i1 regress/i1 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i2: expected/i2 regress/i2 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i3: expected/i3 regress/i3 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i4: expected/i4 regress/i4 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i5: expected/i5 regress/i5 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i6: expected/i6 regress/i6 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i7: expected/i7 regress/i7 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i8: expected/i8 regress/i8 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i9: expected/i9 regress/i9 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i10: expected/i10 regress/i10 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i11: expected/i11 regress/i11 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i12: expected/i12 regress/i12 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i13: expected/i13 regress/i13 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i14: expected/i14 regress/i14 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i15: expected/i15 regress/i15 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i16: expected/i16 regress/i16 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i17: expected/i17 regress/i17 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i18: expected/i18 regress/i18 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i19: expected/i19 regress/i19 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i20: expected/i20 regress/i20 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i21: expected/i21 regress/i21 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i22: expected/i22 regress/i22 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i23: expected/i23 regress/i23 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -bpf1: expected/bpf1 regress/bpf1 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -n1: expected/n1 regress/n1 input/n1 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n2: expected/n2 regress/n2 input/n2 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n3: expected/n3 regress/n3 input/n3 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n4: expected/n4 regress/n4 input/n4 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n5: expected/n5 regress/n5 input/n5 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n6: expected/n6 regress/n6 input/n6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n7: expected/n7 regress/n7 input/n7 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n8: expected/n8 regress/n8 input/n8 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n9: expected/n9 regress/n9 input/n9 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n10: expected/n10 regress/n10 input/n10 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n11: expected/n11 regress/n11 input/n11 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n12: expected/n12 regress/n12 input/n12 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n13: expected/n13 regress/n13 input/n13 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n14: expected/n14 regress/n14 input/n14 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n15: expected/n15 regress/n15 input/n15 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n16: expected/n16 regress/n16 input/n16 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n17: expected/n17 regress/n17 input/n17 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n18: expected/n18 regress/n18 input/n18 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n100: expected/n100 regress/n100 input/n100 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n101: expected/n101 regress/n101 input/n101 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n102: expected/n102 regress/n102 input/n102 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n103: expected/n103 regress/n103 input/n103 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n104: expected/n104 regress/n104 input/n104 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n105: expected/n105 regress/n105 input/n105 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n106: expected/n106 regress/n106 input/n106 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n200: expected/n200 regress/n200 input/n200 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n1_6: expected/n1_6 regress/n1_6 input/n1_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n2_6: expected/n2_6 regress/n2_6 input/n2_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n4_6: expected/n4_6 regress/n4_6 input/n4_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n5_6: expected/n5_6 regress/n5_6 input/n5_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n6_6: expected/n6_6 regress/n6_6 input/n6_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n7_6: expected/n7_6 regress/n7_6 input/n7_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n8_6: expected/n8_6 regress/n8_6 input/n8_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n9_6: expected/n9_6 regress/n9_6 input/n9_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n11_6: expected/n11_6 regress/n11_6 input/n11_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n12_6: expected/n12_6 regress/n12_6 input/n12_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n15_6: expected/n15_6 regress/n15_6 input/n15_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -ni2: expected/ni2 input/ni2 regress/ni2.nat regress/ni2.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni3: expected/ni3 input/ni3 regress/ni3.nat regress/ni3.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni4: expected/ni4 input/ni4 regress/ni4.nat regress/ni4.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni5: expected/ni5 input/ni5 regress/ni5.nat regress/ni5.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni7: expected/ni7 input/ni7 regress/ni7.nat regress/ni7.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni8: expected/ni8 input/ni8 regress/ni8.nat regress/ni8.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni9: expected/ni9 input/ni9 regress/ni9.nat regress/ni9.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni10: expected/ni10 input/ni10 regress/ni10.nat regress/ni10.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni11: expected/ni11 input/ni11 regress/ni11.nat regress/ni11.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni12: expected/ni12 input/ni12 regress/ni12.nat regress/ni12.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni13: expected/ni13 input/ni13 regress/ni13.nat regress/ni13.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni14: expected/ni14 input/ni14 regress/ni14.nat regress/ni14.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni15: expected/ni15 input/ni15 regress/ni15.nat regress/ni15.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni16: expected/ni16 input/ni16 regress/ni16.nat regress/ni16.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni19: expected/ni19 input/ni19 regress/ni19.nat regress/ni19.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni20: expected/ni20 input/ni20 regress/ni20.nat regress/ni20.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni1: expected/ni1 input/ni1 regress/ni1.nat regress/ni1.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni6: expected/ni6 input/ni6 regress/ni6.nat regress/ni6.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni17: expected/ni17 input/ni17 regress/ni17.nat regress/ni17.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni18: expected/ni18 input/ni18 regress/ni18.nat regress/ni18.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni21: expected/ni21 input/ni21 regress/ni21.nat regress/ni21.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni23: expected/ni23 input/ni23 regress/ni23.nat regress/ni23.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -in1: expected/in1 regress/in1 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in2: expected/in2 regress/in2 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in3: expected/in3 regress/in3 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in4: expected/in4 regress/in4 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in5: expected/in5 regress/in5 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in6: expected/in6 regress/in6 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in7: expected/in7 regress/in7 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in8: expected/in8 regress/in8 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in100: expected/in100 regress/in100 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in101: expected/in101 regress/in101 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in102: expected/in102 regress/in102 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -l1: - @/bin/sh ./logtest `awk "/^$@ / { print; } " test.format` - -ipv6.1: expected/ipv6.1 input/ipv6.1 regress/ipv6.1 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.2: expected/ipv6.2 input/ipv6.2 regress/ipv6.2 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.3: expected/ipv6.3 input/ipv6.3 regress/ipv6.3 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.4: expected/ipv6.4 input/ipv6.4 regress/ipv6.4 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.5: expected/ipv6.5 input/ipv6.5 regress/ipv6.5 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.6: expected/ipv6.6 input/ipv6.6 regress/ipv6.6 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -p1: expected/p1 input/p1 regress/p1.ipf regress/p1.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p2: expected/p2 input/p2 regress/p2.ipf $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p3: expected/p3 input/p3 regress/p3.ipf regress/p3.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p4: expected/p4 input/p4 regress/p4.nat regress/p4.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p5: expected/p5 input/p5 regress/p5.ipf regress/p5.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p6: expected/p6 input/p6 regress/p6.ipf regress/p6.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p7: expected/p7 input/p7 regress/p7.nat regress/p7.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p9: expected/p9 input/p9 regress/p9.nat regress/p9.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p10: expected/p10 input/p10 regress/p10.nat regress/p10.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p11: expected/p11 input/p11 regress/p11.nat regress/p11.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p12: expected/p12 input/p12 regress/p12.nat regress/p12.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p13: expected/p13 input/p13 regress/p13.ipf regress/p13.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -ip1: expected/ip1 regress/ip1 $(POOLDEP) - @/bin/sh ./iptest `awk "/^$@ / { print; } " test.format` - -ip2: expected/ip2 input/ip2.data regress/ip2 $(POOLDEP) - @/bin/sh ./iptest `awk "/^$@ / { print; } " test.format` - -ip3: expected/ip3 regress/ip3 $(POOLDEP) - @/bin/sh ./iptest `awk "/^$@ / { print; } " test.format` - -bpf-f1: expected/bpf-f1 regress/bpf-f1 - /bin/sh ./bpftest `awk "/^$@ / { print; } " test.format` - -clean: - /bin/rm -f f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f15 f16 f17 - /bin/rm -f f18 f19 f20 f21 f22 f24 f25 f26 f27 f28 f29 - /bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 i12 i13 i14 i15 i16 i17 - /bin/rm -f i18 i19 i20 i21 i22 i23 - /bin/rm -f n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n100 n101 n102 n103 n104 n105 n106 n200 - /bin/rm -f n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 - /bin/rm -f ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9 - /bin/rm -f ni10 ni11 ni12 ni13 ni14 ni15 ni16 ni17 ni18 ni19 ni20 ni21 ni23 - /bin/rm -f in1 in2 in3 in4 in5 in6 in7 in100 in101 in102 - /bin/rm -f p1 p2 p3 p4 p5 p6 p7 p9 p10 p11 p12 p13 ip1 ip2 ip3 - /bin/rm -f l1 - /bin/rm -f ipv6.1 ipv6.2 ipv6.3 ipv6.4 ipv6.5 ipv6.6 - /bin/rm -f bpf1 bpf-f1 - /bin/rm -f results/* logout - (cd expected; make clean) - -diffs: - -cd expected; for i in *; do if [ -f $$i -a ! -f ../$$i -a -f ../results/$$i ] ; then diff -c $$i ../results/$$i >> ../diff.out; fi done - -n6s: - for i in 1 2 4 5 6 7 11 13 14 15; do \ - sh i4to6 < input/n$${i} > input/n$${i}_6; \ - sh e4to6 < regress/n$${i} > regress/n$${i}_6; \ - sh e4to6 < expected/n$${i} > expected/n$${i}_6; \ - done - for i in 8 9 10 12 17; do \ - sh e4to6 < regress/n$${i} > regress/n$${i}_6; \ - perl h4to6 < input/n$${i} > input/n$${i}_6; \ - done diff --git a/contrib/ipfilter/test/README.TXT b/contrib/ipfilter/test/README.TXT deleted file mode 100644 index 0b62145..0000000 --- a/contrib/ipfilter/test/README.TXT +++ /dev/null @@ -1,30 +0,0 @@ -The contents of this directory sub tree is dedicated to regression testing -of IPFilter. - -The tests are broken down into these groups: -f - filter rule tests -i - parsing & printing test of ipf rules -in - parsing & printing test of ipnat rules -ipv6 - ipv6 filter rule tests -l - logging test -n - NAT testing -ni - combined NAT & IPF tests - - TEST -f1 - block/pass, in/out. -f2 - proto -f3 - from IP# -f4 - to #IP -f5 - source port -f6 - destination port -f7 - icmp-type, code -f8 - flags -f9 - ipoptions -f10 - ipoptions -f11 - keep frag/state -f12 - short/frag -f13 - keep frag/state (fragmented packets) -f14 - from !host, to !host -f15 - groups -f16 - skip -f17 - TCP state transition on flags diff --git a/contrib/ipfilter/test/bpftest b/contrib/ipfilter/test/bpftest deleted file mode 100644 index 5449658f..0000000 --- a/contrib/ipfilter/test/bpftest +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -input=`expr $name : 'bpf-\(.*\)'` -/bin/cp /dev/null results/$name -( while read rule; do - echo "$rule" | ../ipftest -Rbr - -i input/$input >> results/$name - if [ $? -ne 0 ] ; then - exit 1; - fi - echo "--------" >> results/$name -done ) < regress/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/dotest b/contrib/ipfilter/test/dotest deleted file mode 100644 index 71c09b7..0000000 --- a/contrib/ipfilter/test/dotest +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -name=$1 -format=$2 -output=$3 -tuning=$4 - -. ./ipflib.sh - -test_init - -if [ "$tuning" != "" ] ; then - case $tuning in - -*) - ;; - *) - tuning="-T $tuning" - ;; - esac -fi -echo "${name}..."; -n=1 -/bin/cp /dev/null results/${name} -( while read rule; do - set_core $name $n - echo "$rule" | ../ipftest -F $format -Rbr - -i input/${name} $tuning>> results/${name} & - back=$! - wait $back - test_end_leak $? - n=`expr $n + 1` - echo "--------" >> results/${name} -done ) < regress/${name} -check_results $name -exit $status diff --git a/contrib/ipfilter/test/dotest6 b/contrib/ipfilter/test/dotest6 deleted file mode 100755 index d6db564..0000000 --- a/contrib/ipfilter/test/dotest6 +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -format=$2 -mkdir -p results -if [ -f /usr/ucb/touch ] ; then - TOUCH=/usr/ucb/touch -else - if [ -f /usr/bin/touch ] ; then - TOUCH=/usr/bin/touch - else - if [ -f /bin/touch ] ; then - TOUCH=/bin/touch - fi - fi -fi -echo "$1..."; -/bin/cp /dev/null results/$1 -../ipftest -6 -r /dev/null -i /dev/null >/dev/null 2>&1 -if [ $? -ne 0 ] ; then - echo "skipping IPv6 tests" - $TOUCH $1 - exit 0 -fi -( while read rule; do - echo "$rule" | ../ipftest -F $format -6br - -i input/$1 >> results/$1; - if [ $? -ne 0 ] ; then - exit 1; - fi - echo "--------" >> results/$1 -done ) < regress/$1 -cmp expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - $TOUCH $1 -fi -exit $status diff --git a/contrib/ipfilter/test/e4to6 b/contrib/ipfilter/test/e4to6 deleted file mode 100644 index 8755899..0000000 --- a/contrib/ipfilter/test/e4to6 +++ /dev/null @@ -1,61 +0,0 @@ -sed \ --e 's/192.168.126.0/c0a8:7e00::/' \ --e 's/\/32/\/128/g' \ --e 's/\/24/\/112/g' \ --e 's/\/16/\/32/g' \ --e 's/10\.2\.0\.0/10::2:0:0/g' \ --e 's/1\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/1:0:0:0:0:\1:\2:\3/g' \ --e 's/2\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/2:0:0:0:0:\1:\2:\3/g' \ --e 's/4\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/4:\1:\2:0:0:0:0:\3/g' \ --e 's/3\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/3:0:\1:0:0:0:\2:\3/g' \ --e 's/5\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/5:\1:0:0:0:0:\2:\3/g' \ --e 's/9\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/9:\1:\2:0:0:0:0:\3/g' \ --e 's/10\.1\.\([0-9]\)\.\([0-9]\)/10:1:\1:0:0:0:0:\2/g' \ --e 's/10\.10\.\([0-9]*\)\.\([0-9]\)/10:10:\1:0:0:0:0:\2/g' \ --e 's/10\.2\.\([0-9]\)\.\([0-9]\)/10:0:0:0:0:2:\1:\2/g' \ --e 's/10\.4\.3\.\([0-9]\)/10:4:3:0:0:0:0:\1/g' \ --e 's/10\.3\.4\.\([0-9]\)/10:0:0:0:0:3:4:\1/g' \ --e 's/10\.3\.\([0-9]\)\.\([0-9]\)/10:3:\1:0:0:0:0:\2/g' \ --e 's/0\.0\.0\.0/any/g' \ --e 's/ 0\/0 / any /g' \ --e 's/ip #0/ip6\/0/' \ --e 's/40(20) 6 /20 0 6 /' \ --e 's/28(20) 17 /8 0 17 /' \ --e 's/20(20) 0 /1 0 41 /' \ --e 's/48(20) 1 /88 0 58 /g' \ --e 's/20(20) 34 /1 0 34 /g' \ --e 's/20(20) 35 /1 0 35 /g' \ --e 's/20(20) 255 /1 0 255 /g' \ --e 's/ */ /g' | sed \ --e '/use/s/:0:0:0:0:/::/g' \ --e '/map/s/:0:0:0:0:/::/g' \ --e '/rdr/s/:0:0:0:0:/::/g' \ --e '/map/s/:0:0:0:/::/g' \ --e '/rdr/s/:0:0:0:/::/g' \ --e '/MAP/s/:0:0:0:0:0:/::/g' \ --e '/RDR/s/:0:0:0:0:0:/::/g' \ --e '/MAP/s/:0:0:0:0:/::/g' \ --e '/RDR/s/:0:0:0:0:/::/g' \ --e '/MAP/s/:0:0:0:/::/g' \ --e '/RDR/s/:0:0:0:/::/g' \ -| sed \ --e '/MAP/s/ \([0-9][0-9][0-9][0-9]\) / \1 /g' \ --e '/MAP/s/ \([0-9][0-9][0-9]\) / \1 /g' \ --e '/MAP/s/ \([0-9][0-9]\) / \1 /g' \ --e '/RDR/s/ \([0-9][0-9][0-9][0-9]\) / \1 /g' \ --e '/RDR/s/ \([0-9][0-9][0-9]\) / \1 /g' \ --e '/RDR/s/ \([0-9][0-9]\) / \1 /g' \ --e 's/::0:0\//::\//g' \ --e 's/:0:0\//::\//g' \ --e 's/::0\([^:0-9]\)/::\1/g' \ --e 's/::0,/::,/g' \ --e 's/::0:0 \([^>]\)/:: \1/g' \ --e 's/:0:0 \([^>]\)/:: \1/g' \ --e 's/::0 \([^>]\)/:: \1/g' \ -| sed \ --e 's@::\([0-9]*\)::/16@::/16@g' \ --e 's@::\([0-9]*\)::/32@::/32@g' \ --e 's@::\([0-9]*\)::@::\1:0:0@g' \ --e 's@::\([0-9]*\)::@::\1:0:0@g' \ --e 's@::[:0-9]*\([^0-9:]\)/16@::/16@g' \ --e 's@::[:0-9]*\([^0-9:]\)/32@::/32@g' 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) -------------------------------- diff --git a/contrib/ipfilter/test/h4to6 b/contrib/ipfilter/test/h4to6 deleted file mode 100644 index e31f7c4..0000000 --- a/contrib/ipfilter/test/h4to6 +++ /dev/null @@ -1,135 +0,0 @@ -@P=(); -$line = 0; -while (<>) { - s/\=192.168.1.188/\=c0a8:0100::bc/g; - s/\=192.168.1.188/\=c0a8:0100::bc/g; - @F = split; - if (/^#/) { - @P[$nline++] = join(" ",@F); - next; - } - $line = 0 if (/^\[/); - if ($line == 1) { - $len = hex($F[1]) - 20; - $pr = hex($F[4]) & 0xff; - $pr = 58 if ($pr == 1); - $ttl = hex($F[4]) >> 8; - &replaceip($_, $len, $pr, $ttl); - $ipline = $nline; - $err = 0; - } elsif ($line == 2) { - if ($pr == 58) { - # - # Map the ICMP type codes from IPv4 to IPv6 - # and update the checksum to compensate. - # - if ($F[0] =~ /^0800/) { - $F[0] =~ s/^0800/8000/; - $d = 0x7800; - } - if ($F[0] =~ /^0000/) { - $F[0] =~ s/^0000/8100/; - $d = 0x8100; - } - if ($F[0] =~ /^0304/) { - $F[0] =~ s/^0304/0200/; - $d = 0xfefc; - $err = 1; - } - if ($F[0] =~ /^03/) { - $F[0] =~ s/^03/01/; - $d = 0xfe00; - $err = 1; - } - if ($F[0] =~ /^0b/) { - $F[0] =~ s/^0b/03/; - $d = 0xf800; - $err = 1; - } - if ($F[0] =~ /^0c/) { - $F[0] =~ s/^0c/04/; - $d = 0xf800; - $err = 1; - } - $F[1] = sprintf "%04x", hex($F[1]) - $d; - } - @P[$nline++] = join(" ",@F); - } elsif ($line == 3) { - if ($pr == 58 && $err == 1 && $F[0] =~ /^45/) { - local($l) = hex($F[1]) - 20; - local($p) = hex($F[4]) & 0xff; - $p = 58 if ($p == 1); - local($t) = hex($F[4]) >> 8; - &replaceip(join(" ", @F), $l, $p, $t); - @H = split(/ /, $P[$ipline]); - $H[2] += 20; - $P[$ipline] = join(" ",@H); - } else { - @P[$nline++] = join(" ",@F); - } - } else { - @P[$nline++] = join(" ",@F); - } - $line++; -} - -for ($li = 0; $li < $nline; $li++) { - print "$P[$li]\n"; -} - -exit(0); - -sub replaceip { - local(@G) = split(/\s/,$_[0]); - local($p) = ""; - - $p = sprintf "6000 0000 %04x %02x%02x", $_[1], $_[2], $_[3]; - if ($G[6] =~ /^c0a8/) { - $fmt = " %02x%02x %02x00 0000 0000 0000 0000 0000 00%02x"; - } else { - if ($G[6] =~ /^0[4a]../) { - $fmt = " 00%02x 00%02x 00%02x 0000 0000 0000 0000 00%02x"; - } else { - $fmt = " 00%02x 0000 0000 0000 0000 00%02x 00%02x 00%02x"; - } - if ($G[6] =~ /^0a/) { - $G[6] =~ s/^0a/10/; - } - if ($G[6] =~ /0a$/) { - $G[6] =~ s/0a$/10/; - } - if ($G[7] =~ /^0a/) { - $G[7] =~ s/^0a/10/; - } - if ($G[7] =~ /0a$/) { - $G[7] =~ s/0a$/10/; - } - } - $p = $p.sprintf $fmt, hex($G[6]) >> 8, hex($G[6]) & 0xff, - hex($G[7]) >> 8, hex($G[7]) & 0xff; - - if ($G[6] =~ /^c0a8/) { - $fmt = " %02x%02x %02x00 0000 0000 0000 0000 0000 00%02x"; - } else { - if ($G[8] =~ /^0[4a]../) { - $fmt = " 00%02x 00%02x 00%02x 0000 0000 0000 0000 00%02x"; - } else { - $fmt = " 00%02x 0000 0000 0000 0000 00%02x 00%02x 00%02x"; - } - if ($G[8] =~ /^0a/) { - $G[8] =~ s/^0a/10/; - } - if ($G[8] =~ /0a$/) { - $G[8] =~ s/0a$/10/; - } - if ($G[9] =~ /^0a/) { - $G[9] =~ s/^0a/10/; - } - if ($G[9] =~ /0a$/) { - $G[9] =~ s/0a$/10/; - } - } - $p = $p.sprintf $fmt, hex($G[8]) >> 8, hex($G[8]) & 0xff, - hex($G[9]) >> 8, hex($G[9]) & 0xff; - $P[$nline++] = $p; -} diff --git a/contrib/ipfilter/test/i4to6 b/contrib/ipfilter/test/i4to6 deleted file mode 100644 index b1208fd..0000000 --- a/contrib/ipfilter/test/i4to6 +++ /dev/null @@ -1,12 +0,0 @@ -sed \ --e 's/in /in6 /g' \ --e 's/icmp/58/g' \ --e 's/out /out6 /g' \ --e 's/10\.4\.\([0-9]\)\.\([0-9]\)/10:4:\1::\2/g' \ --e 's/10\.3\.4\.\([0-9]\)/10::3:4:\1/g' \ --e 's/10\.3\.\([0-9]\)\.\([0-9]\)/10:3:\1::\2/g' \ --e 's/10\.1\.\([0-9]\)\.\([0-9]\)/10:1:\1::\2/g' \ --e 's/10\.2\.\([0-9]\)\.\([0-9]\)/10::2:\1:\2/g' \ --e 's/9\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/9:\1:\2::\3/g' \ --e 's/5\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/5:\1::\2:\3/g' \ --e 's/2\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/2::\1:\2:\3/g' diff --git a/contrib/ipfilter/test/input/f1 b/contrib/ipfilter/test/input/f1 deleted file mode 100644 index 7c3ae8a..0000000 --- a/contrib/ipfilter/test/input/f1 +++ /dev/null @@ -1,4 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/f10 b/contrib/ipfilter/test/input/f10 deleted file mode 100644 index 254cee7..0000000 --- a/contrib/ipfilter/test/input/f10 +++ /dev/null @@ -1,6 +0,0 @@ -in 1.1.1.1 2.1.1.1 opt lsrr -in 1.1.1.1 2.1.1.1 -in 1.1.1.1 2.1.1.1 opt ts -in 1.1.1.1 2.1.1.1 opt sec-class=topsecret -in 1.1.1.1 2.1.1.1 opt ssrr,sec-class=topsecret -in 1.1.1.1 2.1.1.1 opt sec diff --git a/contrib/ipfilter/test/input/f11 b/contrib/ipfilter/test/input/f11 deleted file mode 100644 index d558150..0000000 --- a/contrib/ipfilter/test/input/f11 +++ /dev/null @@ -1,16 +0,0 @@ -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 S seq=1 ack=0 -in on e0 tcp 1.1.1.1,1 2.1.2.2,24 SA seq=1 ack=1 -in on e1 tcp 2.1.2.2,23 1.1.1.1,2 SA seq=101 ack=2 -in on e1 tcp 2.1.2.2,23 1.1.1.1,1 SA seq=101 ack=2 -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 A seq=2 ack=102 -in on e0 tcp 1.1.1.1,1 2.1.2.2,25 A seq=2 ack=102 -in on e1 tcp 2.1.2.2,23 1.1.1.1,1 A seq=102 ack=2 -in on e1 tcp 2.1.2.2,25 1.1.1.1,1 A seq=102 ack=2 -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 FA seq=2 ack=102 -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 A seq=2 ack=102 -in on e0 tcp 1.1.1.1,2 2.1.2.2,23 A seq=2 ack=102 -in on e1 udp 1.1.1.1,1 4.4.4.4,53 -in on e1 udp 2.2.2.2,2 4.4.4.4,53 -in on e0 udp 4.4.4.4,53 1.1.1.1,1 -in on e0 udp 4.4.4.4,1023 1.1.1.1,2049 -in on e0 udp 4.4.4.4,2049 1.1.1.1,1023 diff --git a/contrib/ipfilter/test/input/f12 b/contrib/ipfilter/test/input/f12 deleted file mode 100644 index 52edde1..0000000 --- a/contrib/ipfilter/test/input/f12 +++ /dev/null @@ -1,44 +0,0 @@ -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF SYN -[] -4500 0028 0000 4000 3f06 36cd 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5002 2000 86c5 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF ACK -[] -4500 0028 0000 4000 3f06 36cd 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 ACK -[] -4500 0028 0000 6000 3f06 16cd 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 -[] -4500 001c 0000 6000 3f06 16d9 0101 0101 0201 0101 -0401 0019 0000 0000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 ACK -[] -4500 001c 0000 6001 3f06 16d8 0101 0101 0201 0101 -0000 0000 5010 2000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 -[] -4500 0014 0000 6000 3f11 16d6 0101 0101 0201 0101 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -[] -4500 0018 0000 2000 3f11 56d2 0101 0101 0201 0101 -0035 0035 - -# 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 -[] -4500 001c 0000 2000 3f11 56ce 0101 0101 0201 0101 -0001 0001 0004 fadc - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -[] -4500 001c 0000 2000 3f11 56ce 0101 0101 0201 0101 -0035 0035 0004 fa74 - diff --git a/contrib/ipfilter/test/input/f13 b/contrib/ipfilter/test/input/f13 deleted file mode 100644 index ccd370a..0000000 --- a/contrib/ipfilter/test/input/f13 +++ /dev/null @@ -1,95 +0,0 @@ -# This checksum is deliberately incorrect. -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF,FO=0 SYN -[in] -4500 0028 0001 4000 3f06 36cc 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 50 02 2000 86bb 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP MF ACK -[in] -4500 0024 0002 2000 3f06 56cf 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5010 2000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP FO=2 ACK -[in] -4500 002c 0002 0002 3f06 76c5 0101 0101 0201 0101 -0000 0000 0001 0203 0405 0607 0809 0a0b 0c0d 0e0f 1011 1213 - -# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 SYN -[in] -4500 0028 0003 6000 3f06 16ca 0101 0101 0201 0101 -0400 0019 7000 0000 0000 0000 5002 2000 16c6 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 -[in] -4500 001c 0004 6000 3f06 16d5 0101 0101 0201 0101 -0401 0019 0000 0000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 SYN -[in] -4500 001c 0005 6001 3f06 16d3 0101 0101 0201 0101 -0000 0000 5010 2000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 -[in] -4500 0014 0006 6000 3f11 16d0 0101 0101 0201 0101 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -[in] -4500 0018 0007 2000 3f11 56cb 0101 0101 0201 0101 -0035 0035 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -[in] -4500 001c 0008 2000 3f11 56c6 0101 0101 0201 0101 -0035 0035 0004 0000 - -# 1.1.1.1,53 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 (short) -[in] -4500 0018 0008 2000 3f11 56ca 0101 0101 0201 0101 -0035 0036 - -# 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 -[in] -4500 001c 0008 2000 3f11 56c6 0101 0101 0201 0101 -0015 0036 0004 0000 - -# 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 TCP MF FO=0 -[in] -4500 001c 0008 2000 3f06 56d1 0101 0101 0201 0101 -0015 0036 0000 0000 0000 0000 50 02 2000 0000 0000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=3 -[in] -4500 001c 0008 0003 3f11 76c3 0101 0101 0201 0101 -0000 0000 0000 0000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=1 -[in] -4500 001c 0008 0001 3f11 76c5 0101 0101 0201 0101 -0000 0000 0000 0000 - -# 2.1.1.1,53 -> 1.1.1.1,53 TTL=63 UDP -[out] -4500 001c 0008 0000 3f11 76c6 0201 0101 0101 0101 -0035 0035 0004 0000 - -# 2.1.1.1,25 -> 1.1.1.1,1014 TTL=63 TCP DF SYN-ACK -[out] -4500 0028 0003 4000 3f06 36ca 0201 0101 0101 0101 -0019 0400 0000 0001 7000 0001 5012 2000 16b4 0000 - -# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK (OOW) -[in] -4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101 -0400 0019 0040 0000 0000 0000 5010 2000 8678 0000 - -# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK (out-of-order) -[in] -4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101 -0400 0019 7000 0004 0000 0002 5010 2000 16b2 0000 - -# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK -[in] -4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101 -0400 0019 7000 0001 0000 0002 5010 2000 16b5 0000 - diff --git a/contrib/ipfilter/test/input/f14 b/contrib/ipfilter/test/input/f14 deleted file mode 100644 index 16a806f..0000000 --- a/contrib/ipfilter/test/input/f14 +++ /dev/null @@ -1,5 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -in 1.1.1.2 1.2.1.1 -in 1.1.2.2 1.2.1.1 -in 1.2.2.2 1.2.1.1 diff --git a/contrib/ipfilter/test/input/f15 b/contrib/ipfilter/test/input/f15 deleted file mode 100644 index db547cb..0000000 --- a/contrib/ipfilter/test/input/f15 +++ /dev/null @@ -1,8 +0,0 @@ -in on hme0 tcp 10.1.2.3,1200 195.134.65.10,100 S -in on hme0 tcp 10.1.2.3,1200 195.134.65.10,22 S -in on hme0 udp 10.1.2.3,1200 195.134.65.10,100 -in on hme0 udp 10.1.2.3,53 195.134.65.10,53 -in on hme0 10.1.2.3 195.134.65.10 -in on hme1 195.134.65.10 10.1.2.3 -in on hme1 udp 195.134.65.10,53 10.1.2.3,53 -in on hme1 tcp 195.134.65.10,22 10.1.2.3,1200 SA diff --git a/contrib/ipfilter/test/input/f16 b/contrib/ipfilter/test/input/f16 deleted file mode 100644 index a17f41f..0000000 --- a/contrib/ipfilter/test/input/f16 +++ /dev/null @@ -1,8 +0,0 @@ -in 2.2.2.2 5.5.5.5 -in 2.2.2.2 1.1.1.1 -in udp 4.4.4.4,110 1.1.1.1,53 -in udp 4.4.4.9,101 1.1.1.3,35 -in udp 4.4.4.8,111 1.1.1.2,53 -in tcp 4.4.4.7,220 1.1.1.1,23 -in tcp 4.4.4.6,202 1.1.1.3,22 -in tcp 4.4.4.5,222 1.1.1.2,52 diff --git a/contrib/ipfilter/test/input/f17 b/contrib/ipfilter/test/input/f17 deleted file mode 100644 index a0d44d7..0000000 --- a/contrib/ipfilter/test/input/f17 +++ /dev/null @@ -1,39 +0,0 @@ -# TCP 1.1.1.1,54076 -> 2.2.2.2,27 SYN -[out,ppp0] -4500 003c 8262 0000 4006 f254 0101 0101 -0202 0202 d33c 0019 bfd0 8989 0000 0000 -a002 4000 cfcd 0000 0204 05b4 0103 0300 -0101 080a 008e 17f7 0000 0000 - -# TCP 2.2.2.2,27 -> 1.1.1.1,54076 ACK -[in,ppp0] -4500 003c 8262 0000 1106 2155 0202 0202 -0101 0101 0019 d33c 4020 3436 bfdf cbc9 -5010 4000 694a 0000 0204 0584 0103 0300 -0101 080a 008e 17f7 0000 0000 - -# TCP 1.1.1.1,54076 -> 2.2.2.2,27 SYN -[out,ppp0] -4500 003c 8265 0000 4006 f251 0101 0101 -0202 0202 d33c 0019 bfd0 8989 0000 0000 -a002 4000 cfc2 0000 0204 05b4 0103 0300 -0101 080a 008e 1802 0000 0000 - -# TCP 2.2.2.2,27 -> 1.1.1.1,54076 SYN-ACK -[in,ppp0] -4500 002c 7442 4000 2906 d784 0202 0202 -0101 0101 0019 d33c ed67 4d4e bfd0 898a -6012 2118 19c2 0000 0204 0584 - -# TCP 1.1.1.1,54076 -> 2.2.2.2,27 ACK -[out,ppp0] -4500 0028 8262 0000 4006 f268 0101 0101 -0202 0202 d33c 0019 bfd0 898a ed67 4d4e -5010 4000 1268 0000 - -# TCP 2.2.2.2,27 -> 1.1.1.1,54076 ACK+data -[in,ppp0] -4500 002a 7442 4000 2906 d786 0202 0202 -0101 0101 0019 d33c ed67 4d4e bfd0 8990 -5012 2118 2f43 0000 0203 - diff --git a/contrib/ipfilter/test/input/f18 b/contrib/ipfilter/test/input/f18 deleted file mode 100644 index 9ecbb7f..0000000 --- a/contrib/ipfilter/test/input/f18 +++ /dev/null @@ -1,4 +0,0 @@ -in on le1 1.1.1.1 3.3.3.3 -in on le1 1.1.1.1 5.5.5.5 -out on le1 2.2.2.2 4.4.4.4 -out on le1 2.2.2.2 6.6.6.6 diff --git a/contrib/ipfilter/test/input/f19 b/contrib/ipfilter/test/input/f19 deleted file mode 100644 index 6cab988..0000000 --- a/contrib/ipfilter/test/input/f19 +++ /dev/null @@ -1,4 +0,0 @@ -in tcp 127.0.0.1,1 127.0.0.1,21 S -in tcp 127.0.0.1,2 127.0.0.1,21 S -in tcp 127.0.0.1,3 127.0.0.1,21 S -in tcp 127.0.0.1,4 127.0.0.1,21 S diff --git a/contrib/ipfilter/test/input/f2 b/contrib/ipfilter/test/input/f2 deleted file mode 100644 index f4e9d23..0000000 --- a/contrib/ipfilter/test/input/f2 +++ /dev/null @@ -1,6 +0,0 @@ -in tcp 127.0.0.1,1 127.0.0.1,ftp -in tcp 1.1.1.1,1 1.2.1.1,ftp -in udp 127.0.0.1,1 127.0.0.1,21 -in udp 1.1.1.1,1 1.2.1.1,21 -in icmp 127.0.0.1 127.0.0.1 -in icmp 1.1.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/f20 b/contrib/ipfilter/test/input/f20 deleted file mode 100644 index 605ba7c..0000000 --- a/contrib/ipfilter/test/input/f20 +++ /dev/null @@ -1,2 +0,0 @@ -out on de0 1.1.1.1 2.2.2.2 -out on ab0 1.1.1.1 2.2.2.2 diff --git a/contrib/ipfilter/test/input/f21 b/contrib/ipfilter/test/input/f21 deleted file mode 100644 index 1135cbd..0000000 --- a/contrib/ipfilter/test/input/f21 +++ /dev/null @@ -1,31 +0,0 @@ -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -# IP 4.4.4.4 2.2.2.2 TCP(20480,80) -[out,df0] -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 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH -[in,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 -0404 0404 0303 acab 0000 0000 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) REDIRECT -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[in,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 -0404 0404 0501 9a9d 0808 0808 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 5.5.5.5 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH -[in,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 -0505 0505 0303 acab 0000 0000 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - diff --git a/contrib/ipfilter/test/input/f22 b/contrib/ipfilter/test/input/f22 deleted file mode 100644 index a5221c1a..0000000 --- a/contrib/ipfilter/test/input/f22 +++ /dev/null @@ -1,31 +0,0 @@ -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -# IP 4.4.4.4 2.2.2.2 TCP(20480,80) -[in,df0] -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 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 -0404 0404 0303 acab 0000 0000 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) REDIRECT -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 -0404 0404 0501 9a9d 0808 0808 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 5.5.5.5 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 -0505 0505 0303 acab 0000 0000 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - diff --git a/contrib/ipfilter/test/input/f24 b/contrib/ipfilter/test/input/f24 deleted file mode 100644 index 030772b..0000000 --- a/contrib/ipfilter/test/input/f24 +++ /dev/null @@ -1,27 +0,0 @@ -[out,hme0] -4500 003f 6e48 0000 4011 8816 c0a8 0101 -c0a8 01fe eb22 0035 002b d9e6 4a82 0100 -0001 0000 0000 0000 0663 6f6f 6d62 7303 -616e 7503 6564 7502 6175 0000 0100 01 - -[in,hme0] -4500 004c fc96 2000 4011 d9ba c0a8 01fe -c0a8 0101 0035 eb22 00a9 d7b9 4a82 8180 -0001 0001 0003 0003 0663 6f6f 6d62 7303 -616e 7503 6564 7502 6175 0000 0100 01c0 -0c00 0100 0100 0000 3c00 0496 - -[in,hme0] -4500 004c fc96 2007 4011 d9b3 c0a8 01fe -c0a8 0101 cbe7 50c0 1300 0200 0100 0078 -8c00 0603 6e73 31c0 13c0 1300 0200 0100 -0078 8c00 0e02 6e73 0861 6465 6c61 6964 -65c0 17c0 1300 0200 0100 0078 - -[in,hme0] -4500 004d fc96 000c 4011 f9ad c0a8 01fe -c0a8 0101 8c00 0603 756e 61c0 13c0 6b00 -0100 0100 0027 5800 0496 cb16 1cc0 5100 -0100 0100 0018 4700 0481 7f28 03c0 3f00 -0100 0100 0027 5800 0496 cb01 0a - diff --git a/contrib/ipfilter/test/input/f25 b/contrib/ipfilter/test/input/f25 deleted file mode 100644 index a4e3139..0000000 --- a/contrib/ipfilter/test/input/f25 +++ /dev/null @@ -1,41 +0,0 @@ -[in,hme0]+mcast -4500 0081 b02d 0000 0411 53b1 c0a8 01eb -efff fffa 1f48 076c 006d 1bd2 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -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 - -[out,hme0] -4500 0108 7aca 0000 4011 79e1 c0a8 01fe -c0a8 01eb 076c 1f48 00f4 5218 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 - -[in,hme0]+mcast -4500 0081 b02d 0000 0411 53b1 c0a8 01eb -efff fffa 1f48 076c 006d 1bd2 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -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 - diff --git a/contrib/ipfilter/test/input/f26 b/contrib/ipfilter/test/input/f26 deleted file mode 100644 index 2151f72..0000000 --- a/contrib/ipfilter/test/input/f26 +++ /dev/null @@ -1,13 +0,0 @@ -in tcp 1.1.1.1,1001 2.2.2.2,22 S -in tcp 1.1.1.1,1002 2.2.2.2,22 S -in tcp 1.1.1.1,1003 2.2.2.2,22 S -in tcp 1.1.1.1,1004 2.2.2.2,22 S -in tcp 1.1.1.2,1002 2.2.2.2,22 S -in tcp 1.1.1.3,1003 2.2.2.2,22 S -in tcp 1.1.1.4,1004 2.2.2.2,22 S -in tcp 1.1.1.2,1005 2.2.2.2,22 S -in tcp 1.1.1.3,1006 2.2.2.2,22 S -in tcp 1.1.1.4,1007 2.2.2.2,22 S -in tcp 1.1.1.2,1008 2.2.2.2,22 S -in tcp 1.1.1.3,1009 2.2.2.2,22 S -in tcp 1.1.1.4,1010 2.2.2.2,22 S diff --git a/contrib/ipfilter/test/input/f27 b/contrib/ipfilter/test/input/f27 deleted file mode 100644 index f01bf7e..0000000 --- a/contrib/ipfilter/test/input/f27 +++ /dev/null @@ -1,84 +0,0 @@ -[in,hme0] -45000028 0000 0000 FF06 b5ca -01010101 02020202 -03e9 0016 00000000 00000000 5002 0000 -a5de 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5ca -01010101 02020202 -03ea 0016 00000000 00000000 5002 0000 -a5dd 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5ca -01010101 02020202 -03eb 0016 00000000 00000000 5002 0000 -a5dc 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5ca -01010101 02020202 -03ec 0016 00000000 00000000 5002 0000 -a5db 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c9 -01010102 02020202 -03ed 0016 00000000 00000000 5002 0000 -a5d9 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c8 -01010103 02020202 -03ee 0016 00000000 00000000 5002 0000 -a5d7 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c7 -01010104 02020202 -03ef 0016 00000000 00000000 5002 0000 -a5d5 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c9 -01010102 02020202 -03f0 0016 00000000 00000000 5002 0000 -a5d6 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c8 -01010103 02020202 -03f1 0016 00000000 00000000 5002 0000 -a5d4 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c7 -01010104 02020202 -03f2 0016 00000000 00000000 5002 0000 -a5d2 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c9 -01010102 02020202 -03f3 0016 00000000 00000000 5002 0000 -a5d3 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c8 -01010103 02020202 -03f4 0016 00000000 00000000 5002 0000 -a5d1 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c7 -01010104 02020202 -03f5 0016 00000000 00000000 5002 0000 -a5cf 0000 - -[in,hme0] -6000 0000 0014 06FF -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -03f6 0016 0000 0000 0000 0000 5002 0000 292a 0000 - diff --git a/contrib/ipfilter/test/input/f28 b/contrib/ipfilter/test/input/f28 deleted file mode 100644 index 8849c14..0000000 --- a/contrib/ipfilter/test/input/f28 +++ /dev/null @@ -1,7 +0,0 @@ -in on nic1 4.4.0.1 4.2.0.2 -in on nic2 4.4.1.1 4.2.1.2 -in on nic3 4.4.2.1 4.2.2.2 -in on nic0 4.4.3.1 4.2.3.2 -in on nic0 4.4.1.1 4.2.1.2 -in on nic0 4.4.2.1 4.2.2.2 -in on nic0 4.4.3.1 4.2.3.2 diff --git a/contrib/ipfilter/test/input/f29 b/contrib/ipfilter/test/input/f29 deleted file mode 100644 index 2e717af..0000000 --- a/contrib/ipfilter/test/input/f29 +++ /dev/null @@ -1,11 +0,0 @@ -in on nic1 4.4.0.1 4.2.0.2 -in on nic2 4.4.1.1 4.2.1.2 -in on nic3 4.4.2.1 4.2.2.2 -in on nic0 udp 4.4.3.1,1000 4.2.3.2,2000 -in on nic0 udp 4.4.3.1,1000 4.2.3.2,2000 -in on nic0 udp 4.4.1.1,1001 4.2.1.2,2001 -in on nic0 udp 4.4.1.1,1001 4.2.1.2,2001 -in on nic0 udp 4.4.2.1,1002 4.2.2.2,2002 -in on nic0 udp 4.4.2.1,1002 4.2.2.2,2002 -in on nic0 udp 4.4.3.1,1003 4.2.3.2,2003 -in on nic0 udp 4.4.3.1,1003 4.2.3.2,2003 diff --git a/contrib/ipfilter/test/input/f3 b/contrib/ipfilter/test/input/f3 deleted file mode 100644 index 16a806f..0000000 --- a/contrib/ipfilter/test/input/f3 +++ /dev/null @@ -1,5 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -in 1.1.1.2 1.2.1.1 -in 1.1.2.2 1.2.1.1 -in 1.2.2.2 1.2.1.1 diff --git a/contrib/ipfilter/test/input/f30 b/contrib/ipfilter/test/input/f30 deleted file mode 100644 index ebf7dc0..0000000 --- a/contrib/ipfilter/test/input/f30 +++ /dev/null @@ -1,16 +0,0 @@ -in on hme0 udp 1.1.1.1,53 2.1.1.1,53 opt lsrr -in on hme1 udp 2.1.1.1,53 1.1.1.1,53 opt ts,lsrr -in on hme1 udp 2.1.1.1,53 1.1.1.1,53 opt lsrr -in on hme0 udp 1.1.1.1,53 2.1.1.1,53 -in on hme1 udp 2.1.1.1,53 1.1.1.1,53 -in on hme0 tcp 1.1.1.1,12345 2.1.1.1,22 S opt rr -in on hme0 tcp 1.1.1.1,12345 2.1.1.1,22 S -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA opt rr,ts -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA opt rr -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA -in on hme0 tcp 1.1.1.1,12346 2.1.1.1,22 S opt sec-class=secret -in on hme0 tcp 1.1.1.1,12346 2.1.1.1,22 S -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt sec-class=topsecret -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt ts,sec-class=secret -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt sec-class=secret -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA diff --git a/contrib/ipfilter/test/input/f4 b/contrib/ipfilter/test/input/f4 deleted file mode 100644 index 2956d1b..0000000 --- a/contrib/ipfilter/test/input/f4 +++ /dev/null @@ -1,5 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.1.1.1 -in 1.1.1.1 1.1.1.2 -in 1.1.1.1 1.1.2.2 -in 1.1.1.1 1.2.2.2 diff --git a/contrib/ipfilter/test/input/f5 b/contrib/ipfilter/test/input/f5 deleted file mode 100644 index 41600c1..0000000 --- a/contrib/ipfilter/test/input/f5 +++ /dev/null @@ -1,28 +0,0 @@ -in tcp 1.1.1.1,0 2.2.2.2,2222 -in tcp 1.1.1.1,1 2.2.2.2,2222 -in tcp 1.1.1.1,23 2.2.2.2,2222 -in tcp 1.1.1.1,21 2.2.2.2,2222 -in tcp 1.1.1.1,1023 2.2.2.2,2222 -in tcp 1.1.1.1,1024 2.2.2.2,2222 -in tcp 1.1.1.1,1025 2.2.2.2,2222 -in tcp 1.1.1.1,32767 2.2.2.2,2222 -in tcp 1.1.1.1,32768 2.2.2.2,2222 -in tcp 1.1.1.1,65535 2.2.2.2,2222 -in tcp 1.1.1.1,5999 2.2.2.2,2222 -in tcp 1.1.1.1,6000 2.2.2.2,2222 -in tcp 1.1.1.1,6009 2.2.2.2,2222 -in tcp 1.1.1.1,6010 2.2.2.2,2222 -in udp 1.1.1.1,0 2.2.2.2,2222 -in udp 1.1.1.1,1 2.2.2.2,2222 -in udp 1.1.1.1,23 2.2.2.2,2222 -in udp 1.1.1.1,21 2.2.2.2,2222 -in udp 1.1.1.1,1023 2.2.2.2,2222 -in udp 1.1.1.1,1024 2.2.2.2,2222 -in udp 1.1.1.1,1025 2.2.2.2,2222 -in udp 1.1.1.1,32767 2.2.2.2,2222 -in udp 1.1.1.1,32768 2.2.2.2,2222 -in udp 1.1.1.1,65535 2.2.2.2,2222 -in udp 1.1.1.1,5999 2.2.2.2,2222 -in udp 1.1.1.1,6000 2.2.2.2,2222 -in udp 1.1.1.1,6009 2.2.2.2,2222 -in udp 1.1.1.1,6010 2.2.2.2,2222 diff --git a/contrib/ipfilter/test/input/f6 b/contrib/ipfilter/test/input/f6 deleted file mode 100644 index 21f0be3..0000000 --- a/contrib/ipfilter/test/input/f6 +++ /dev/null @@ -1,28 +0,0 @@ -in tcp 2.2.2.2,2222 1.1.1.1,0 -in tcp 2.2.2.2,2222 1.1.1.1,1 -in tcp 2.2.2.2,2222 1.1.1.1,23 -in tcp 2.2.2.2,2222 1.1.1.1,21 -in tcp 2.2.2.2,2222 1.1.1.1,1023 -in tcp 2.2.2.2,2222 1.1.1.1,1024 -in tcp 2.2.2.2,2222 1.1.1.1,1025 -in tcp 2.2.2.2,2222 1.1.1.1,32767 -in tcp 2.2.2.2,2222 1.1.1.1,32768 -in tcp 2.2.2.2,2222 1.1.1.1,65535 -in tcp 2.2.2.2,2222 1.1.1.1,5999 -in tcp 2.2.2.2,2222 1.1.1.1,6000 -in tcp 2.2.2.2,2222 1.1.1.1,6009 -in tcp 2.2.2.2,2222 1.1.1.1,6010 -in udp 2.2.2.2,2222 1.1.1.1,0 -in udp 2.2.2.2,2222 1.1.1.1,1 -in udp 2.2.2.2,2222 1.1.1.1,23 -in udp 2.2.2.2,2222 1.1.1.1,21 -in udp 2.2.2.2,2222 1.1.1.1,1023 -in udp 2.2.2.2,2222 1.1.1.1,1024 -in udp 2.2.2.2,2222 1.1.1.1,1025 -in udp 2.2.2.2,2222 1.1.1.1,32767 -in udp 2.2.2.2,2222 1.1.1.1,32768 -in udp 2.2.2.2,2222 1.1.1.1,65535 -in udp 2.2.2.2,2222 1.1.1.1,5999 -in udp 2.2.2.2,2222 1.1.1.1,6000 -in udp 2.2.2.2,2222 1.1.1.1,6009 -in udp 2.2.2.2,2222 1.1.1.1,6010 diff --git a/contrib/ipfilter/test/input/f7 b/contrib/ipfilter/test/input/f7 deleted file mode 100644 index dbc9e33..0000000 --- a/contrib/ipfilter/test/input/f7 +++ /dev/null @@ -1,15 +0,0 @@ -in icmp 1.1.1.1 2.1.1.1 echo -in icmp 1.1.1.1 2.1.1.1 echo,1 -in icmp 1.1.1.1 2.1.1.1 echo,3 -in icmp 1.1.1.1 2.1.1.1 unreach -in icmp 1.1.1.1 2.1.1.1 unreach,1 -in icmp 1.1.1.1 2.1.1.1 unreach,3 -in icmp 1.1.1.1 2.1.1.1 echorep -in icmp 1.1.1.1 2.1.1.1 echorep,1 -in icmp 1.1.1.1 2.1.1.1 echorep,3 -in icmp 2.2.2.2 3.3.3.3 maskreq -out icmp 3.3.3.3 2.2.2.2 maskrep -in icmp 4.4.4.4 5.5.5.5 timest -out icmp 5.5.5.5 4.4.4.4 timestrep -in icmp 6.6.6.6 7.7.7.7 inforeq -out icmp 7.7.7.7 6.6.6.6 inforep diff --git a/contrib/ipfilter/test/input/f8 b/contrib/ipfilter/test/input/f8 deleted file mode 100644 index cace511..0000000 --- a/contrib/ipfilter/test/input/f8 +++ /dev/null @@ -1,6 +0,0 @@ -in tcp 1.1.1.1,1 2.1.2.2,1 S -in tcp 1.1.1.1,1 2.1.2.2,1 SA -in tcp 1.1.1.1,1 2.1.2.2,1 SF -in tcp 1.1.1.1,1 2.1.2.2,1 SFPAUR -in tcp 1.1.1.1,1 2.1.2.2,1 PAU -in tcp 1.1.1.1,1 2.1.2.2,1 A diff --git a/contrib/ipfilter/test/input/f9 b/contrib/ipfilter/test/input/f9 deleted file mode 100644 index e64e299..0000000 --- a/contrib/ipfilter/test/input/f9 +++ /dev/null @@ -1,9 +0,0 @@ -in 1.1.1.1 2.1.1.1 opt lsrr -in 1.1.1.1 2.1.1.1 opt lsrr=1.1.1.1 -in 1.1.1.1 2.1.1.1 opt lsrr,ssrr -in 1.1.1.1 2.1.1.1 opt ts -in 1.1.1.1 2.1.1.1 opt satid -in 1.1.1.1 2.1.1.1 opt satid=234 -in 1.1.1.1 2.1.1.1 opt sec-class=topsecret -in 1.1.1.1 2.1.1.1 opt ssrr,sec-class=topsecret -in 1.1.1.1 2.1.1.1 opt sec diff --git a/contrib/ipfilter/test/input/ip2.data b/contrib/ipfilter/test/input/ip2.data deleted file mode 100644 index ef34eb5..0000000 --- a/contrib/ipfilter/test/input/ip2.data +++ /dev/null @@ -1,3 +0,0 @@ -1.1.1.1/32 -!2.2.0.0/16 -2.2.2.0/24 diff --git a/contrib/ipfilter/test/input/ipv6.1 b/contrib/ipfilter/test/input/ipv6.1 deleted file mode 100644 index 6da8da0..0000000 --- a/contrib/ipfilter/test/input/ipv6.1 +++ /dev/null @@ -1,45 +0,0 @@ -# -# traceroute simulation -# -# UDP -# -[out,gif0] 6000 0000 0018 1101 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -8083 829a -0018 -f4c1 -0000 0344 0000 0004 f8f1 9d3c ddba 0e00 - -# -# ICMPV6 -# - Time exceeded -# -[in,gif0] 6000 0000 0048 3a40 -ef00 1001 0880 6cbf 0000 0000 0000 0001 -ef00 1001 2002 0001 0000 0000 0000 0070 -0300 f86f 0000 0000 -6000 0000 0018 1101 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -8083 829a -0018 -f427 -0000 0344 0000 0004 f8f1 9d3c ddba 0e00 - -# -# ICMPV6 -# - Time exceeded -# -[in,gif0] 6000 0000 0048 3a40 -ef00 1001 0880 6cbf 0000 0000 0000 0001 -ef00 1001 2002 0001 0000 0000 0000 0070 -0300 7266 0000 0000 -6000 0000 0018 1101 -ef00 1001 2002 1001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -8083 f8a3 -0018 -f427 -0000 0344 0000 0004 f8f1 9d3c ddba 0e00 - diff --git a/contrib/ipfilter/test/input/ipv6.2 b/contrib/ipfilter/test/input/ipv6.2 deleted file mode 100644 index 8cc2d17..0000000 --- a/contrib/ipfilter/test/input/ipv6.2 +++ /dev/null @@ -1,26 +0,0 @@ -[out,de0] -6000 0000 0020 3aff ef00 0000 0000 0000 -0000 0000 0001 0013 ff02 0000 0000 0000 -0000 0001 ff01 000b 8700 ea32 0000 0000 -ef00 0000 0000 0000 0000 0000 0001 000b -0101 0048 5487 5c6f - -[in,de0] -6000 0000 0020 3aff ef00 0000 0000 0000 -0000 0000 0001 000b ef00 0000 0000 0000 -0000 0000 0001 0013 8800 5322 6000 0000 -ef00 0000 0000 0000 0000 0000 0001 000b -0201 0800 2071 cce1 - -[out,de0] -6000 0000 0010 3a40 ef00 0000 0000 0000 -0000 0000 0001 0013 ef00 0000 0000 0000 -0000 0000 0001 000b 8000 3210 06ff 0002 -9ec3 3c3c 8a82 0300 - -[in,de0] -6000 0000 0010 3aff ef00 0000 0000 0000 -0000 0000 0001 000b ef00 0000 0000 0000 -0000 0000 0001 0013 8100 3110 06ff 0002 -9ec3 3c3c 8a82 0300 - diff --git a/contrib/ipfilter/test/input/ipv6.3 b/contrib/ipfilter/test/input/ipv6.3 deleted file mode 100644 index 3b2ef4d..0000000 --- a/contrib/ipfilter/test/input/ipv6.3 +++ /dev/null @@ -1,30 +0,0 @@ -[out,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4395 3ffe 8280 0000 2001 -0000 0000 0000 4394 8000 3f77 085c 0038 -0c06 b73d 1b3d 0d00 - -[in,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4393 3ffe 8280 0000 2001 -0000 0000 0000 4395 8100 3e78 085c 0038 -0c06 b73d 1b3d 0d00 - -[in,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4394 3ffe 8280 0000 2001 -0000 0000 0000 4395 8300 3c77 085c 0038 -0c06 b73d 1b3d 0d00 - -[in,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4394 3ffe 8280 0000 2001 -0000 0000 0000 4395 8000 3f77 085c 0038 -0c06 b73d 1b3d 0d00 - -[in,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4394 3ffe 8280 0000 2001 -0000 0000 0000 4395 8100 3e77 085c 0038 -0c06 b73d 1b3d 0d00 - diff --git a/contrib/ipfilter/test/input/ipv6.4 b/contrib/ipfilter/test/input/ipv6.4 deleted file mode 100644 index eb986ae..0000000 --- a/contrib/ipfilter/test/input/ipv6.4 +++ /dev/null @@ -1,522 +0,0 @@ -# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (0|1448) icmp6: echo request -[in,eth0] -6000 0000 05b0 2c40 fe80 0000 0000 0000 -020c 29ff fe13 6899 fe80 0000 0000 0000 -020c 29ff fe21 5742 3a00 0001 0000 0008 -8000 f400 2c0a 0001 fd38 4a42 9e59 0900 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f - -# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (1448|160) -[in,eth0] -6000 0000 00a8 2c40 fe80 0000 0000 0000 -020c 29ff fe13 6899 fe80 0000 0000 0000 -020c 29ff fe21 5742 3a00 05a8 0000 0008 -a0a1 a2a3 a4a5 a6a7 a8a9 aaab acad aeaf -b0b1 b2b3 b4b5 b6b7 b8b9 babb bcbd bebf -c0c1 c2c3 c4c5 c6c7 c8c9 cacb cccd cecf -d0d1 d2d3 d4d5 d6d7 d8d9 dadb dcdd dedf -e0e1 e2e3 e4e5 e6e7 e8e9 eaeb eced eeef -f0f1 f2f3 f4f5 f6f7 f8f9 fafb fcfd feff -0001 0203 0405 0607 0809 0a0b 0c0d 0e0f -1011 1213 1415 1617 1819 1a1b 1c1d 1e1f -2021 2223 2425 2627 2829 2a2b 2c2d 2e2f -3031 3233 3435 3637 3839 3a3b 3c3d 3e3f - -# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (0|1232) icmp6: echo reply -[out,eth0] -6000 0000 04d8 2c40 fe80 0000 0000 0000 -020c 29ff fe21 5742 fe80 0000 0000 0000 -020c 29ff fe13 6899 3a00 0001 9c56 86dd -8100 f300 2c0a 0001 fd38 4a42 9e59 0900 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 - -# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (1232|376) -[out,eth0] -6000 0000 0180 2c40 fe80 0000 0000 0000 -020c 29ff fe21 5742 fe80 0000 0000 0000 -020c 29ff fe13 6899 3a00 04d0 9c56 86dd -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f - -# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (0|1448) icmp6: echo request -[in,eth0] -6000 0000 05b0 2c40 fe80 0000 0000 0000 -020c 29ff fe13 6899 fe80 0000 0000 0000 -020c 29ff fe21 5742 3a00 0001 0000 0009 -8000 80fb 2c0a 0002 fe38 4a42 105e 0900 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f - -# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (1448|160) -[in,eth0] -6000 0000 00a8 2c40 fe80 0000 0000 0000 -020c 29ff fe13 6899 fe80 0000 0000 0000 -020c 29ff fe21 5742 3a00 05a8 0000 0009 -a0a1 a2a3 a4a5 a6a7 a8a9 aaab acad aeaf -b0b1 b2b3 b4b5 b6b7 b8b9 babb bcbd bebf -c0c1 c2c3 c4c5 c6c7 c8c9 cacb cccd cecf -d0d1 d2d3 d4d5 d6d7 d8d9 dadb dcdd dedf -e0e1 e2e3 e4e5 e6e7 e8e9 eaeb eced eeef -f0f1 f2f3 f4f5 f6f7 f8f9 fafb fcfd feff -0001 0203 0405 0607 0809 0a0b 0c0d 0e0f -1011 1213 1415 1617 1819 1a1b 1c1d 1e1f -2021 2223 2425 2627 2829 2a2b 2c2d 2e2f -3031 3233 3435 3637 3839 3a3b 3c3d 3e3f - -# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (0|1232) icmp6: echo reply -[out,eth0] -6000 0000 04d8 2c40 fe80 0000 0000 0000 -020c 29ff fe21 5742 fe80 0000 0000 0000 -020c 29ff fe13 6899 3a00 0001 9889 f4c1 -8100 7ffb 2c0a 0002 fe38 4a42 105e 0900 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 - -# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (1232|376) -[out,eth0] -6000 0000 0180 2c40 fe80 0000 0000 0000 -020c 29ff fe21 5742 fe80 0000 0000 0000 -020c 29ff fe13 6899 3a00 04d0 9889 f4c1 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f - -# frag: [0-7:nh][8-15:res][16-31:off][32-64:id] -# Case 4: ipv6,fragment[id=10,off=0,m=1],tcp -[in,eth0] -600a af74 0038 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0600 0001 0000 0010 -fff3 0017 52ac fbab 0000 0000 c002 8000 d36b 0000 -0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 0000 0000 - -# Case 5: ipv6,fragment[id=10,off=5,m=1],data -[in,eth0] -600a af74 0010 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0600 0030 0000 0010 -0000 0000 0000 0000 - -# Case 3: ipv6,fragment[id=10,off=1,m=0],tcp -[in,eth0] -600a af74 0034 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0600 0008 0000 0010 -0000 0000 b002 8000 d36b 0000 -0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 - -# Case 1: ipv6,fragment[id=11,off=0,m=1],hopopts,ah[next=dstopts] -[in,eth0] -600a af74 0020 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0000 0001 0000 0011 -3300 0000 0000 0000 -3c01 0000 0000 0000 0000 0000 0000 0000 - -# Case 2: ipv6,fragment[id=11,off=3,m=0],dstopts,hop,tcp -[in,eth0] -600a af74 002c 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -3c00 0008 0000 0011 -0000 0000 0000 0000 -0600 0000 0000 0000 -fff3 0017 52ac fbab 0000 0000 5002 8000 d36b 0000 - -# Case 4: ipv6,fragment[id=10,off=0,m=1],tcp -[out,eth0] -6000 0000 001c 2c40 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -fe80 0000 0000 0000 020c 29ff fe21 5742 -0600 0001 0000 0010 -0017 fff3 0000 0000 52ac fbac 5014 0000 cd26 0000 - -# Normal TCP Reset -[out,eth0] -6000 0000 0014 0640 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -fe80 0000 0000 0000 020c 29ff fe21 5742 -0017 fff3 0000 0000 52ac fbac 5014 0000 cd26 0000 - -# Case 4: ipv6,fragment[id=12,off=0,m=1],tcp -[in,eth0] -600a af74 0038 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0600 0001 0000 0012 -fff3 0017 52ac fbab 0000 0000 c002 8000 d36b 0000 -0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 0000 0000 - diff --git a/contrib/ipfilter/test/input/ipv6.5 b/contrib/ipfilter/test/input/ipv6.5 deleted file mode 100644 index e46407c..0000000 --- a/contrib/ipfilter/test/input/ipv6.5 +++ /dev/null @@ -1,14 +0,0 @@ -[out,de0] -6000 0000 002c 2bff -ef00 0000 0000 0000 0000 0000 0001 0013 -ff02 0000 0000 0000 0000 0001 ff01 000b -0602 0000 0000 0000 -ff02 0000 0000 0000 0000 0001 ff01 000b -0401 0019 0000 0000 0000 0000 5002 2000 9ea3 0000 - -[out,de0] -6000 0000 0014 06ff -ef00 0000 0000 0000 0000 0000 0001 0013 -ff02 0000 0000 0000 0000 0001 ff01 000b -0401 0019 0000 0000 0000 0000 5002 2000 9ea3 0000 - diff --git a/contrib/ipfilter/test/input/ipv6.6 b/contrib/ipfilter/test/input/ipv6.6 deleted file mode 100644 index fffbad2..0000000 --- a/contrib/ipfilter/test/input/ipv6.6 +++ /dev/null @@ -1,31 +0,0 @@ -[out,gif0] -6000 0000 0020 2c01 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -1100 0001 0000 0001 -8083 829a -0020 -f4c1 -0000 0000 0000 0000 0000 0000 0000 0000 - -[out,gif0] -6000 0000 0020 2c01 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -1100 0008 0000 0001 -0000 0000 0000 0000 0000 0000 0000 0000 - -[out,gif0] -6000 0000 001e 2c01 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -1100 0001 0000 0001 -0000 0000 0000 0000 0000 0000 0000 - -[out,gif0] -6000 0000 0020 2c01 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -1100 001c 0000 0001 -0000 0000 0000 0000 0000 0000 0000 0000 - diff --git a/contrib/ipfilter/test/input/l1 b/contrib/ipfilter/test/input/l1 deleted file mode 100644 index a59dbe3..0000000 --- a/contrib/ipfilter/test/input/l1 +++ /dev/null @@ -1,64 +0,0 @@ -# 1.1.1.1,1025 -> 2.2.2.2,25 TTL=63 TCP DF SYN -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0001 0000 0000 5002 2000 85c2 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0001 0000 0000 5010 2000 85b4 0000 - -#in on e1 tcp 2.1.2.2,25 1.1.1.1,1025 AS -[] -4500 0028 0000 4000 3f06 35cb 0202 0202 0101 0101 -0019 0401 0000 0011 0000 0002 5012 2000 85a0 0000 - -#in on e1 tcp 2.1.2.2,25 1.1.1.1,1025 A -[out,e1] 4500 0028 0000 4000 3f06 35cb 0202 0202 0101 0101 -0019 0401 0000 0012 0000 0002 5010 2000 85a1 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 AF -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0002 0000 0012 5011 2000 85a0 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0012 0000 0003 5010 2000 85a0 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0012 0000 0003 5010 2000 85a0 0000 - -#in on e1 udp 1.1.1.1,1 4.4.4.4,53 -[] -4500 0028 0000 4000 3f11 31bc 0101 0101 0404 0404 -0001 0035 0000 d16f 0102 0304 0506 0708 090a 0b0d - -#in on e1 udp 2.2.2.2,2 4.4.4.4,53 -[] -4500 0028 0000 4000 3f11 2fba 0202 0202 0404 0404 -0001 0035 0000 0000 0102 0304 0506 0708 090a 0b0d - -#in on e1 udp 2.2.2.2,2 4.4.4.4,53 -[] -4500 0038 0000 4000 3f11 2faa 0202 0202 0404 0404 -0001 0035 0000 d47b 0102 0304 0506 0708 090a 0b0d -0e0f 4061 4263 4465 4667 4869 4a6b 4c6d - -#in on e0 ip 4.4.4.4,53 1.1.1.1,1 -[] -4500 0014 0000 4000 3f00 2fdf 0202 0202 0404 0404 - -#in on e0 udp 3.3.3.3,1023 1.1.1.1,2049 -[] -4500 001c 0000 4000 3f11 33ca 0303 0303 0101 0101 -03ff 0801 0000 ebde - -#in on e0 udp 1.1.1.1,2049 3.3.3.3,1023 -[] -4500 001c 0000 4000 3f11 33ca 0101 0101 0303 0303 -0801 03ff 0000 0000 - diff --git a/contrib/ipfilter/test/input/n1 b/contrib/ipfilter/test/input/n1 deleted file mode 100644 index 04b24ef..0000000 --- a/contrib/ipfilter/test/input/n1 +++ /dev/null @@ -1,34 +0,0 @@ -out on zx0 255 10.1.1.0 10.1.1.2 -out on zx0 255 10.1.1.1 10.1.1.2 -out on zx0 255 10.1.1.2 10.1.1.1 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025 -out on zx0 255 10.2.2.1 10.1.2.1 -out on zx0 255 10.2.2.2 10.1.2.1 -in on zx0 255 10.1.1.1 10.1.1.2 -in on zx0 255 10.1.1.2 10.1.1.1 -in on zx0 255 10.2.2.1 10.2.1.1 -in on zx0 255 10.2.2.2 10.2.1.1 -in on zx0 255 10.2.2.3 10.1.1.1 -in on zx0 255 10.2.3.4 10.2.2.2 -in on zx0 255 10.1.1.1 10.2.2.2 -in on zx0 255 10.1.1.2 10.2.2.2 -in on zx0 255 10.1.1.0 10.3.4.5 -in on zx0 255 10.1.1.1 10.3.4.5 -in on zx0 255 10.1.1.2 10.3.4.5 -in on zx0 tcp 10.1.1.1,1025 10.3.4.5,1025 -out on zx0 icmp 10.1.1.1 10.4.3.2 -in on zx0 icmp 10.4.3.2 10.2.2.2 -in on zx0 icmp 10.4.3.2 10.3.4.1 -in on zx0 icmp 10.4.3.2 10.3.4.2 -in on zx0 icmp 10.4.3.2 10.3.4.3 -in on zx0 icmp 10.4.3.2 10.3.4.4 -in on zx0 icmp 10.4.3.2 10.3.4.5 -out on zx0 34 10.1.1.2 10.4.3.2 -in on zx0 34 10.4.3.2 10.3.4.4 -out on zx0 34 10.1.1.2 10.4.3.4 -in on zx0 34 10.4.3.4 10.3.4.5 -out on zx0 34 10.1.1.3 10.4.3.4 -in on zx0 34 10.4.3.4 10.3.4.6 -out on zx0 35 10.1.1.3 10.4.3.4 -in on zx0 35 10.4.3.4 10.3.4.7 diff --git a/contrib/ipfilter/test/input/n10 b/contrib/ipfilter/test/input/n10 deleted file mode 100644 index 1e919cc..0000000 --- a/contrib/ipfilter/test/input/n10 +++ /dev/null @@ -1,6 +0,0 @@ -# TCP SYN packet with an MSS option -[out,ppp0] -4500 002c 10c9 4000 ff06 3289 c0a8 0103 96cb e002 -8032 0015 bd6b c9c8 0000 0000 -6002 2238 35f9 0000 0204 05b4 - diff --git a/contrib/ipfilter/test/input/n100 b/contrib/ipfilter/test/input/n100 deleted file mode 100644 index 94ff8c4..0000000 --- a/contrib/ipfilter/test/input/n100 +++ /dev/null @@ -1,8 +0,0 @@ -out on zx0 255 1.1.1.1 2.3.2.3 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 255 1.1.1.2 2.2.2.3 -out on zx0 255 1.2.1.2 2.2.2.3 -out on zx0 255 1.1.1.1 2.2.2.4 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 tcp 1.1.1.1,101 2.3.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 diff --git a/contrib/ipfilter/test/input/n101 b/contrib/ipfilter/test/input/n101 deleted file mode 100644 index 94ff8c4..0000000 --- a/contrib/ipfilter/test/input/n101 +++ /dev/null @@ -1,8 +0,0 @@ -out on zx0 255 1.1.1.1 2.3.2.3 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 255 1.1.1.2 2.2.2.3 -out on zx0 255 1.2.1.2 2.2.2.3 -out on zx0 255 1.1.1.1 2.2.2.4 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 tcp 1.1.1.1,101 2.3.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 diff --git a/contrib/ipfilter/test/input/n102 b/contrib/ipfilter/test/input/n102 deleted file mode 100644 index 94ff8c4..0000000 --- a/contrib/ipfilter/test/input/n102 +++ /dev/null @@ -1,8 +0,0 @@ -out on zx0 255 1.1.1.1 2.3.2.3 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 255 1.1.1.2 2.2.2.3 -out on zx0 255 1.2.1.2 2.2.2.3 -out on zx0 255 1.1.1.1 2.2.2.4 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 tcp 1.1.1.1,101 2.3.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 diff --git a/contrib/ipfilter/test/input/n103 b/contrib/ipfilter/test/input/n103 deleted file mode 100644 index 7957799..0000000 --- a/contrib/ipfilter/test/input/n103 +++ /dev/null @@ -1,8 +0,0 @@ -out on zx0 tcp 1.1.1.1,101 2.3.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 -out on zx0 tcp 1.1.1.2,101 2.2.2.3,203 -out on zx0 tcp 10.10.10.10,101 2.2.2.3,203 -out on zx0 tcp 5.5.5.5,101 2.2.2.3,203 -in on zx0 tcp 2.2.2.3,4000 4.4.4.4,1000 -out on zx0 tcp 7.7.7.7,101 2.2.2.3,203 diff --git a/contrib/ipfilter/test/input/n104 b/contrib/ipfilter/test/input/n104 deleted file mode 100644 index bb46b28..0000000 --- a/contrib/ipfilter/test/input/n104 +++ /dev/null @@ -1,48 +0,0 @@ -[out,zx0] -4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202 -0065 00cb 0000 0001 1000 0001 5010 2000 789d 0000 - -[in,zx0] -4500 0028 0002 0000 ff06 b1c2 0606 0001 0404 0001 -0fa0 03e8 0000 0001 1000 0001 5010 2000 623f 0000 - -[out,zx0] -4500 0028 0003 0000 ff06 b5c7 0101 0101 0202 0202 -0066 00cb 0000 0001 1000 0001 5010 2000 789c 0000 - -[in,zx0] -4500 0028 0004 0000 ff06 b1bf 0606 0001 0404 0002 -0fa0 03e8 0000 0001 1000 0001 5010 2000 623e 0000 - -[out,zx0] -4500 0028 0005 0000 ff06 b5c5 0101 0101 0202 0202 -0067 00cb 0000 0001 1000 0001 5010 2000 789b 0000 - -[in,zx0] -4500 0028 0006 0000 ff06 b1bd 0606 0001 0404 0002 -0fa0 03e9 0000 0001 1000 0001 5010 2000 623d 0000 - -[out,zx0] -4500 0028 0007 0000 ff06 b5c3 0101 0101 0202 0202 -0068 00cb 0000 0001 1000 0001 5010 2000 789a 0000 - -[in,zx0] -4500 0028 0008 0000 ff06 b1ba 0606 0002 0404 0002 -0fa0 03e9 0000 0001 1000 0001 5010 2000 623c 0000 - -[out,zx0] -4500 0028 0009 0000 ff06 b5c1 0101 0101 0202 0202 -0069 00cb 0000 0001 1000 0001 5010 2000 7899 0000 - -[in,zx0] -4500 0028 000a 0000 ff06 b1b8 0606 0002 0404 0002 -0fa1 03e9 0000 0001 1000 0001 5010 2000 623b 0000 - -[out,zx0] -4500 0028 000b 0000 ff06 b5bf 0101 0101 0202 0202 -006a 00cb 0000 0001 1000 0001 5010 2000 7898 0000 - -[in,zx0] -4500 0028 000c 0000 ff06 b1b5 0606 0002 0404 0003 -0fa1 03e9 0000 0001 1000 0001 5010 2000 623a 0000 - diff --git a/contrib/ipfilter/test/input/n105 b/contrib/ipfilter/test/input/n105 deleted file mode 100644 index 63b68f0..0000000 --- a/contrib/ipfilter/test/input/n105 +++ /dev/null @@ -1,8 +0,0 @@ -[in,zx0] -4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202 -0065 0050 0000 0001 1000 0001 5010 2000 7918 0000 - -[out,zx0] -4500 0028 0001 0000 ff06 adc0 0606 0001 0404 0404 -0c38 03e8 0000 0001 1000 0001 5010 2000 61a4 0000 - diff --git a/contrib/ipfilter/test/input/n106 b/contrib/ipfilter/test/input/n106 deleted file mode 100644 index 4e93378..0000000 --- a/contrib/ipfilter/test/input/n106 +++ /dev/null @@ -1,8 +0,0 @@ -[out,zx0] -4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202 -0065 0050 0000 0001 1000 0001 5010 2000 7918 0000 - -[in,zx0] -4500 0028 0001 0000 ff06 adc0 0606 0001 0404 0404 -0c38 03e8 0000 0001 1000 0001 5010 2000 61a4 0000 - diff --git a/contrib/ipfilter/test/input/n10_6 b/contrib/ipfilter/test/input/n10_6 deleted file mode 100644 index 5c1f5af..0000000 --- a/contrib/ipfilter/test/input/n10_6 +++ /dev/null @@ -1,6 +0,0 @@ -# TCP SYN packet with an MSS option -[out,ppp0] -6000 0000 0018 06ff c0a8 0100 0000 0000 0000 0000 0000 0003 96cb e000 0000 0000 0000 0000 0000 0002 -8032 0015 bd6b c9c8 0000 0000 -6002 2238 35f9 0000 0204 05b4 - diff --git a/contrib/ipfilter/test/input/n11 b/contrib/ipfilter/test/input/n11 deleted file mode 100644 index 8712674..0000000 --- a/contrib/ipfilter/test/input/n11 +++ /dev/null @@ -1,16 +0,0 @@ -out on zx0 255 10.1.1.0 10.1.1.2 -out on zx0 255 10.1.1.1 10.1.1.2 -out on zx0 255 10.1.1.2 10.1.1.1 -out on zx0 255 10.2.2.1 10.1.2.1 -out on zx0 255 10.2.2.2 10.1.2.1 -in on zx0 255 10.1.1.1 10.1.1.2 -in on zx0 255 10.1.1.2 10.1.1.1 -in on zx0 255 10.2.2.1 10.2.1.1 -in on zx0 255 10.2.2.2 10.2.1.1 -in on zx0 255 10.2.2.3 10.1.1.1 -in on zx0 255 10.2.3.4 10.2.2.2 -in on zx0 255 10.1.1.1 10.2.2.2 -in on zx0 255 10.1.1.2 10.2.2.2 -in on zx0 255 10.1.1.0 10.3.4.5 -in on zx0 255 10.1.1.1 10.3.4.5 -in on zx0 255 10.1.1.2 10.3.4.5 diff --git a/contrib/ipfilter/test/input/n11_6 b/contrib/ipfilter/test/input/n11_6 deleted file mode 100644 index 128e45a..0000000 --- a/contrib/ipfilter/test/input/n11_6 +++ /dev/null @@ -1,16 +0,0 @@ -out6 on zx0 255 10:1:1::0 10:1:1::2 -out6 on zx0 255 10:1:1::1 10:1:1::2 -out6 on zx0 255 10:1:1::2 10:1:1::1 -out6 on zx0 255 10::2:2:1 10:1:2::1 -out6 on zx0 255 10::2:2:2 10:1:2::1 -in6 on zx0 255 10:1:1::1 10:1:1::2 -in6 on zx0 255 10:1:1::2 10:1:1::1 -in6 on zx0 255 10::2:2:1 10::2:1:1 -in6 on zx0 255 10::2:2:2 10::2:1:1 -in6 on zx0 255 10::2:2:3 10:1:1::1 -in6 on zx0 255 10::2:3:4 10::2:2:2 -in6 on zx0 255 10:1:1::1 10::2:2:2 -in6 on zx0 255 10:1:1::2 10::2:2:2 -in6 on zx0 255 10:1:1::0 10::3:4:5 -in6 on zx0 255 10:1:1::1 10::3:4:5 -in6 on zx0 255 10:1:1::2 10::3:4:5 diff --git a/contrib/ipfilter/test/input/n12 b/contrib/ipfilter/test/input/n12 deleted file mode 100644 index 16e479e..0000000 --- a/contrib/ipfilter/test/input/n12 +++ /dev/null @@ -1,18 +0,0 @@ -[out,le0=192.168.1.188] -4510 0040 2020 4000 4006 17e1 c0a8 7e53 c0a8 0303 -12c2 0017 4e33 298e 0000 0000 -b002 4000 07af 0000 0204 05b4 0101 0402 -0103 0300 0101 080a 0c72 549e 0000 0000 - -[in,le0] -4500 003c 00b0 4000 fe06 f5fb c0a8 0303 c0a8 01bc -0017 2710 f674 e02c 4e33 298f -a012 2798 e317 0000 0101 080a 2c05 b797 -0c72 549e 0103 0300 0204 05b4 - -[out,le0] -4510 0034 493b 4000 4006 eed1 c0a8 7e53 c0a8 0303 -12c2 0017 4e33 298f f674 e02d -8010 4000 8e2a 0000 0101 080a 0c72 549e -2c05 b797 - diff --git a/contrib/ipfilter/test/input/n12_6 b/contrib/ipfilter/test/input/n12_6 deleted file mode 100644 index 8583acb..0000000 --- a/contrib/ipfilter/test/input/n12_6 +++ /dev/null @@ -1,18 +0,0 @@ -[out,le0=c0a8:0100::bc] -6000 0000 002c 0640 c0a8 7e00 0000 0000 0000 0000 0000 0053 c0a8 0300 0000 0000 0000 0000 0000 0003 -12c2 0017 4e33 298e 0000 0000 -b002 4000 07af 0000 0204 05b4 0101 0402 -0103 0300 0101 080a 0c72 549e 0000 0000 - -[in,le0] -6000 0000 0028 06fe c0a8 0300 0000 0000 0000 0000 0000 0003 c0a8 0100 0000 0000 0000 0000 0000 00bc -0017 2710 f674 e02c 4e33 298f -a012 2798 e317 0000 0101 080a 2c05 b797 -0c72 549e 0103 0300 0204 05b4 - -[out,le0] -6000 0000 0020 0640 c0a8 7e00 0000 0000 0000 0000 0000 0053 c0a8 0300 0000 0000 0000 0000 0000 0003 -12c2 0017 4e33 298f f674 e02d -8010 4000 8e2a 0000 0101 080a 0c72 549e -2c05 b797 - diff --git a/contrib/ipfilter/test/input/n13 b/contrib/ipfilter/test/input/n13 deleted file mode 100644 index ac7bbbd..0000000 --- a/contrib/ipfilter/test/input/n13 +++ /dev/null @@ -1,4 +0,0 @@ -out on le0 192.168.1.1 150.1.1.1 -out on le0 192.168.1.1 150.1.1.2 -out on le0 192.168.1.2 150.1.1.2 -out on le0 192.168.1.3 150.1.1.1 diff --git a/contrib/ipfilter/test/input/n13_6 b/contrib/ipfilter/test/input/n13_6 deleted file mode 100644 index 54b262d..0000000 --- a/contrib/ipfilter/test/input/n13_6 +++ /dev/null @@ -1,4 +0,0 @@ -out6 on le0 192:168:1::1 150:1:1::1 -out6 on le0 192:168:1::1 150:1:1::2 -out6 on le0 192:168:1::2 150:1:1::2 -out6 on le0 192:168:1::3 150:1:1::1 diff --git a/contrib/ipfilter/test/input/n14 b/contrib/ipfilter/test/input/n14 deleted file mode 100644 index 969eb1c..0000000 --- a/contrib/ipfilter/test/input/n14 +++ /dev/null @@ -1,4 +0,0 @@ -in on gre0 tcp 10.2.2.5,2000 203.1.1.1,80 -in on gre0 tcp 10.2.2.6,2000 203.1.1.1,80 -in on gre0 tcp 10.2.2.7,2000 203.1.1.1,80 -in on gre0 tcp 10.2.2.5,2001 203.1.1.1,80 diff --git a/contrib/ipfilter/test/input/n14_6 b/contrib/ipfilter/test/input/n14_6 deleted file mode 100644 index f5dd5d3..0000000 --- a/contrib/ipfilter/test/input/n14_6 +++ /dev/null @@ -1,4 +0,0 @@ -in6 on gre0 tcp 10::2:2:5,2000 203:1:1::1,80 -in6 on gre0 tcp 10::2:2:6,2000 203:1:1::1,80 -in6 on gre0 tcp 10::2:2:7,2000 203:1:1::1,80 -in6 on gre0 tcp 10::2:2:5,2001 203:1:1::1,80 diff --git a/contrib/ipfilter/test/input/n15 b/contrib/ipfilter/test/input/n15 deleted file mode 100644 index 715848e..0000000 --- a/contrib/ipfilter/test/input/n15 +++ /dev/null @@ -1,2 +0,0 @@ -in on le0 tcp 9.9.9.9,10011 5.5.5.5,80 -in on le0 tcp 9.9.9.9,10011 2.2.2.2,80 diff --git a/contrib/ipfilter/test/input/n15_6 b/contrib/ipfilter/test/input/n15_6 deleted file mode 100644 index 4a56138..0000000 --- a/contrib/ipfilter/test/input/n15_6 +++ /dev/null @@ -1,2 +0,0 @@ -in6 on le0 tcp 9:9:9::9,10011 5:5::5:5,80 -in6 on le0 tcp 9:9:9::9,10011 2::2:2:2,80 diff --git a/contrib/ipfilter/test/input/n16 b/contrib/ipfilter/test/input/n16 deleted file mode 100644 index ad09a45..0000000 --- a/contrib/ipfilter/test/input/n16 +++ /dev/null @@ -1,40 +0,0 @@ -[in,vlan0] -4520 0068 17e4 0000 6b11 3539 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 - -[out,vlan2] -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 - -[in,vlan2] -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 - -[out,vlan0] -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 - diff --git a/contrib/ipfilter/test/input/n17 b/contrib/ipfilter/test/input/n17 deleted file mode 100644 index 29709de..0000000 --- a/contrib/ipfilter/test/input/n17 +++ /dev/null @@ -1,24 +0,0 @@ -[out,zx0] -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 - -[in,zx0] -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 - diff --git a/contrib/ipfilter/test/input/n17_6 b/contrib/ipfilter/test/input/n17_6 deleted file mode 100644 index a176c15..0000000 --- a/contrib/ipfilter/test/input/n17_6 +++ /dev/null @@ -1,24 +0,0 @@ -[out,zx0] -6000 0000 008c 063f 0001 0000 0000 0000 0000 0001 0001 0001 0002 0000 0000 0000 0000 0001 0001 0001 -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 - -[in,zx0] -6000 0000 008c 063f 0002 0000 0000 0000 0000 0001 0001 0001 0001 0000 0000 0000 0000 0001 0001 0003 -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 - diff --git a/contrib/ipfilter/test/input/n18 b/contrib/ipfilter/test/input/n18 deleted file mode 100644 index a7a610c..0000000 --- a/contrib/ipfilter/test/input/n18 +++ /dev/null @@ -1,8 +0,0 @@ -out on z0 tcp 2.2.2.2,22 3.3.3.3,30 -out on z0 tcp 2.2.2.2,23 3.3.3.3,31 -out on z0 tcp 2.2.2.2,24 3.3.3.3,32 -out on z0 tcp 2.2.2.2,25 3.3.3.3,33 -out on z0 tcp 2.2.2.2,26 3.3.3.3,34 -out on z0 tcp 2.2.2.2,27 3.3.3.3,35 -out on z0 tcp 2.2.2.2,28 3.3.3.3,36 -out on z0 tcp 2.2.2.2,29 3.3.3.3,37 diff --git a/contrib/ipfilter/test/input/n1_6 b/contrib/ipfilter/test/input/n1_6 deleted file mode 100644 index c1badab..0000000 --- a/contrib/ipfilter/test/input/n1_6 +++ /dev/null @@ -1,34 +0,0 @@ -out6 on zx0 255 10:1:1::0 10:1:1::2 -out6 on zx0 255 10:1:1::1 10:1:1::2 -out6 on zx0 255 10:1:1::2 10:1:1::1 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025 -out6 on zx0 255 10::2:2:1 10:1:2::1 -out6 on zx0 255 10::2:2:2 10:1:2::1 -in6 on zx0 255 10:1:1::1 10:1:1::2 -in6 on zx0 255 10:1:1::2 10:1:1::1 -in6 on zx0 255 10::2:2:1 10::2:1:1 -in6 on zx0 255 10::2:2:2 10::2:1:1 -in6 on zx0 255 10::2:2:3 10:1:1::1 -in6 on zx0 255 10::2:3:4 10::2:2:2 -in6 on zx0 255 10:1:1::1 10::2:2:2 -in6 on zx0 255 10:1:1::2 10::2:2:2 -in6 on zx0 255 10:1:1::0 10::3:4:5 -in6 on zx0 255 10:1:1::1 10::3:4:5 -in6 on zx0 255 10:1:1::2 10::3:4:5 -in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,1025 -out6 on zx0 58 10:1:1::1 10:4:3::2 -in6 on zx0 58 10:4:3::2 10::2:2:2 -in6 on zx0 58 10:4:3::2 10::3:4:1 -in6 on zx0 58 10:4:3::2 10::3:4:2 -in6 on zx0 58 10:4:3::2 10::3:4:3 -in6 on zx0 58 10:4:3::2 10::3:4:4 -in6 on zx0 58 10:4:3::2 10::3:4:5 -out6 on zx0 34 10:1:1::2 10:4:3::2 -in6 on zx0 34 10:4:3::2 10::3:4:4 -out6 on zx0 34 10:1:1::2 10:4:3::4 -in6 on zx0 34 10:4:3::4 10::3:4:5 -out6 on zx0 34 10:1:1::3 10:4:3::4 -in6 on zx0 34 10:4:3::4 10::3:4:6 -out6 on zx0 35 10:1:1::3 10:4:3::4 -in6 on zx0 35 10:4:3::4 10::3:4:7 diff --git a/contrib/ipfilter/test/input/n2 b/contrib/ipfilter/test/input/n2 deleted file mode 100644 index 476f16e..0000000 --- a/contrib/ipfilter/test/input/n2 +++ /dev/null @@ -1,19 +0,0 @@ -out on zx0 tcp 10.1.1.1,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025 -out on zx0 10.1.1.0 10.1.1.2 -out on zx0 10.1.1.1 10.1.2.1 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025 -out on zx0 udp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.3,2000 10.1.2.1,80 -out on zx0 tcp 10.1.1.3,2001 10.1.3.1,80 -out on zx0 tcp 10.1.1.3,2002 10.1.4.1,80 -out on zx0 tcp 10.1.1.3,2003 10.1.4.1,80 -in on zx0 10.1.1.1 10.1.1.2 -in on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025 -in on zx0 10.1.1.2 10.1.1.1 -in on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000 -in on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000 -in on zx0 udp 10.1.1.2,1025 10.3.4.5,40001 -in on zx0 tcp 10.1.2.1,80 10.3.4.5,40001 diff --git a/contrib/ipfilter/test/input/n200 b/contrib/ipfilter/test/input/n200 deleted file mode 100644 index 9b02158..0000000 --- a/contrib/ipfilter/test/input/n200 +++ /dev/null @@ -1,6 +0,0 @@ -[in,bar0] -4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 - -[out,bar0] -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 - diff --git a/contrib/ipfilter/test/input/n2_6 b/contrib/ipfilter/test/input/n2_6 deleted file mode 100644 index 3ea74ff..0000000 --- a/contrib/ipfilter/test/input/n2_6 +++ /dev/null @@ -1,19 +0,0 @@ -out6 on zx0 tcp 10:1:1::1,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025 -out6 on zx0 10:1:1::0 10:1:1::2 -out6 on zx0 10:1:1::1 10:1:2::1 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025 -out6 on zx0 udp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::3,2000 10:1:2::1,80 -out6 on zx0 tcp 10:1:1::3,2001 10:1:3::1,80 -out6 on zx0 tcp 10:1:1::3,2002 10:1:4::1,80 -out6 on zx0 tcp 10:1:1::3,2003 10:1:4::1,80 -in6 on zx0 10:1:1::1 10:1:1::2 -in6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025 -in6 on zx0 10:1:1::2 10:1:1::1 -in6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000 -in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000 -in6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001 -in6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001 diff --git a/contrib/ipfilter/test/input/n3 b/contrib/ipfilter/test/input/n3 deleted file mode 100644 index deca317..0000000 --- a/contrib/ipfilter/test/input/n3 +++ /dev/null @@ -1,5 +0,0 @@ -out on zz0 tcp 10.1.1.1,5000 203.1.1.1,80 -out on zz0 tcp 10.1.1.1,252 203.1.1.1,80 -out on zz0 tcp 10.1.0.0,32768 203.1.1.1,80 -out on zz0 udp 10.1.0.0,32768 203.1.1.1,80 -out on zz0 tcp 10.1.255.255,65535 203.1.1.1,80 diff --git a/contrib/ipfilter/test/input/n4 b/contrib/ipfilter/test/input/n4 deleted file mode 100644 index 1218ef9..0000000 --- a/contrib/ipfilter/test/input/n4 +++ /dev/null @@ -1,10 +0,0 @@ -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,23 -out on zx0 tcp 10.2.2.1,10023 10.3.3.3,12345 -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,53 -out on zx0 tcp 10.2.2.1,10053 10.3.3.3,12345 -in on zx0 tcp 10.3.3.3,12346 10.1.0.0,23 -out on zx0 tcp 10.2.2.1,10023 10.3.3.3,12346 -in on zx0 udp 10.3.3.3,12345 10.1.1.0,53 -out on zx0 udp 10.2.2.1,10053 10.3.3.3,12345 -in on zx0 tcp 10.3.3.3,12345 10.1.1.0,53 -out on zx0 tcp 10.2.2.1,53 10.3.3.3,12345 diff --git a/contrib/ipfilter/test/input/n4_6 b/contrib/ipfilter/test/input/n4_6 deleted file mode 100644 index 8f0f423..0000000 --- a/contrib/ipfilter/test/input/n4_6 +++ /dev/null @@ -1,10 +0,0 @@ -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,23 -out6 on zx0 tcp 10::2:2:1,10023 10:3:3::3,12345 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,53 -out6 on zx0 tcp 10::2:2:1,10053 10:3:3::3,12345 -in6 on zx0 tcp 10:3:3::3,12346 10:1:0::0,23 -out6 on zx0 tcp 10::2:2:1,10023 10:3:3::3,12346 -in6 on zx0 udp 10:3:3::3,12345 10:1:1::0,53 -out6 on zx0 udp 10::2:2:1,10053 10:3:3::3,12345 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::0,53 -out6 on zx0 tcp 10::2:2:1,53 10:3:3::3,12345 diff --git a/contrib/ipfilter/test/input/n5 b/contrib/ipfilter/test/input/n5 deleted file mode 100644 index 579210b..0000000 --- a/contrib/ipfilter/test/input/n5 +++ /dev/null @@ -1,54 +0,0 @@ -out on zx0 255 10.1.1.0 10.1.1.2 -out on zx0 255 10.1.1.1 10.1.1.2 -out on zx0 255 10.1.1.2 10.1.1.1 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025 -out on zx0 255 10.2.2.1 10.1.2.1 -out on zx0 255 10.2.2.2 10.1.2.1 -in on zx0 255 10.1.1.1 10.1.1.2 -in on zx0 255 10.1.1.2 10.1.1.1 -in on zx0 255 10.2.2.1 10.2.1.1 -in on zx0 255 10.2.2.2 10.2.1.1 -in on zx0 255 10.2.2.3 10.1.1.1 -in on zx0 255 10.2.3.4 10.2.2.2 -in on zx0 255 10.1.1.1 10.2.2.2 -in on zx0 255 10.1.1.2 10.2.2.2 -in on zx0 255 10.1.1.0 10.3.4.5 -in on zx0 255 10.1.1.1 10.3.4.5 -in on zx0 255 10.1.1.2 10.3.4.5 -in on zx0 tcp 10.1.1.1,1025 10.3.4.5,1025 -out on zx0 icmp 10.1.1.1 10.4.3.2 -in on zx0 icmp 10.4.3.2 10.2.2.2 -in on zx0 icmp 10.4.3.2 10.3.4.3 -in on zx0 icmp 10.4.3.2 10.3.4.5 -out on zx0 34 10.1.1.2 10.4.3.2 -in on zx0 34 10.4.3.2 10.3.4.4 -out on zx0 34 10.1.1.2 10.4.3.4 -in on zx0 34 10.4.3.4 10.3.4.5 -out on zx0 34 10.1.1.3 10.4.3.4 -in on zx0 34 10.4.3.4 10.3.4.6 -out on zx0 35 10.1.1.3 10.4.3.4 -in on zx0 35 10.4.3.4 10.3.4.7 -out on zx0 tcp 10.1.1.1,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025 -out on zx0 10.1.1.0 10.1.1.2 -out on zx0 10.1.1.1 10.1.2.1 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025 -out on zx0 udp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.3,2000 10.1.2.1,80 -out on zx0 tcp 10.1.1.3,2001 10.1.3.1,80 -out on zx0 tcp 10.1.1.3,2002 10.1.4.1,80 -out on zx0 tcp 10.1.1.3,2003 10.1.4.1,80 -in on zx0 10.1.1.1 10.1.1.2 -in on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025 -in on zx0 10.1.1.2 10.1.1.1 -out on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000 -in on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000 -out on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000 -in on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000 -out on zx0 udp 10.1.1.2,1025 10.3.4.5,40001 -in on zx0 udp 10.1.1.2,1025 10.3.4.5,40001 -out on zx0 tcp 10.1.2.1,80 10.3.4.5,40001 -in on zx0 tcp 10.1.2.1,80 10.3.4.5,40001 diff --git a/contrib/ipfilter/test/input/n5_6 b/contrib/ipfilter/test/input/n5_6 deleted file mode 100644 index 9ac0c29..0000000 --- a/contrib/ipfilter/test/input/n5_6 +++ /dev/null @@ -1,54 +0,0 @@ -out6 on zx0 255 10:1:1::0 10:1:1::2 -out6 on zx0 255 10:1:1::1 10:1:1::2 -out6 on zx0 255 10:1:1::2 10:1:1::1 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025 -out6 on zx0 255 10::2:2:1 10:1:2::1 -out6 on zx0 255 10::2:2:2 10:1:2::1 -in6 on zx0 255 10:1:1::1 10:1:1::2 -in6 on zx0 255 10:1:1::2 10:1:1::1 -in6 on zx0 255 10::2:2:1 10::2:1:1 -in6 on zx0 255 10::2:2:2 10::2:1:1 -in6 on zx0 255 10::2:2:3 10:1:1::1 -in6 on zx0 255 10::2:3:4 10::2:2:2 -in6 on zx0 255 10:1:1::1 10::2:2:2 -in6 on zx0 255 10:1:1::2 10::2:2:2 -in6 on zx0 255 10:1:1::0 10::3:4:5 -in6 on zx0 255 10:1:1::1 10::3:4:5 -in6 on zx0 255 10:1:1::2 10::3:4:5 -in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,1025 -out6 on zx0 58 10:1:1::1 10:4:3::2 -in6 on zx0 58 10:4:3::2 10::2:2:2 -in6 on zx0 58 10:4:3::2 10::3:4:3 -in6 on zx0 58 10:4:3::2 10::3:4:5 -out6 on zx0 34 10:1:1::2 10:4:3::2 -in6 on zx0 34 10:4:3::2 10::3:4:4 -out6 on zx0 34 10:1:1::2 10:4:3::4 -in6 on zx0 34 10:4:3::4 10::3:4:5 -out6 on zx0 34 10:1:1::3 10:4:3::4 -in6 on zx0 34 10:4:3::4 10::3:4:6 -out6 on zx0 35 10:1:1::3 10:4:3::4 -in6 on zx0 35 10:4:3::4 10::3:4:7 -out6 on zx0 tcp 10:1:1::1,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025 -out6 on zx0 10:1:1::0 10:1:1::2 -out6 on zx0 10:1:1::1 10:1:2::1 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025 -out6 on zx0 udp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::3,2000 10:1:2::1,80 -out6 on zx0 tcp 10:1:1::3,2001 10:1:3::1,80 -out6 on zx0 tcp 10:1:1::3,2002 10:1:4::1,80 -out6 on zx0 tcp 10:1:1::3,2003 10:1:4::1,80 -in6 on zx0 10:1:1::1 10:1:1::2 -in6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025 -in6 on zx0 10:1:1::2 10:1:1::1 -out6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000 -in6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000 -out6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000 -in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000 -out6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001 -in6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001 -out6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001 -in6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001 diff --git a/contrib/ipfilter/test/input/n6 b/contrib/ipfilter/test/input/n6 deleted file mode 100644 index 8a0c924..0000000 --- a/contrib/ipfilter/test/input/n6 +++ /dev/null @@ -1,13 +0,0 @@ -in on zx0 tcp 10.2.2.2,12345 10.1.1.1,23 -in on zx0 tcp 10.2.2.2,12345 10.1.1.2,23 -in on zx0 tcp 10.3.0.1,12345 10.1.2.2,23 -in on zx0 tcp 10.3.0.1,12345 10.2.2.2,23 -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,23 -in on zx0 tcp 10.2.2.2,12345 10.1.1.1,53 -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,53 -in on zx0 tcp 10.2.2.2,12345 10.1.0.0,23 -in on zx0 tcp 10.3.3.3,12345 10.1.0.0,23 -in on zx0 udp 10.2.2.2,12345 10.1.1.0,53 -in on zx0 udp 10.3.3.3,12345 10.1.1.0,53 -in on zx0 tcp 10.2.2.2,12345 10.1.1.0,53 -in on zx0 tcp 10.3.3.3,12345 10.1.1.0,53 diff --git a/contrib/ipfilter/test/input/n6_6 b/contrib/ipfilter/test/input/n6_6 deleted file mode 100644 index 18300cd..0000000 --- a/contrib/ipfilter/test/input/n6_6 +++ /dev/null @@ -1,13 +0,0 @@ -in6 on zx0 tcp 10::2:2:2,12345 10:1:1::1,23 -in6 on zx0 tcp 10::2:2:2,12345 10:1:1::2,23 -in6 on zx0 tcp 10:3:0::1,12345 10:1:2::2,23 -in6 on zx0 tcp 10:3:0::1,12345 10::2:2:2,23 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,23 -in6 on zx0 tcp 10::2:2:2,12345 10:1:1::1,53 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,53 -in6 on zx0 tcp 10::2:2:2,12345 10:1:0::0,23 -in6 on zx0 tcp 10:3:3::3,12345 10:1:0::0,23 -in6 on zx0 udp 10::2:2:2,12345 10:1:1::0,53 -in6 on zx0 udp 10:3:3::3,12345 10:1:1::0,53 -in6 on zx0 tcp 10::2:2:2,12345 10:1:1::0,53 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::0,53 diff --git a/contrib/ipfilter/test/input/n7 b/contrib/ipfilter/test/input/n7 deleted file mode 100644 index 79af901..0000000 --- a/contrib/ipfilter/test/input/n7 +++ /dev/null @@ -1,9 +0,0 @@ -in on zx0 tcp 10.2.3.1,1230 10.1.1.1,22 -in on zx0 tcp 10.2.3.1,1231 10.1.1.1,23 -in on zx0 tcp 10.2.3.1,1232 10.1.1.1,50 -in on zx0 tcp 10.2.3.1,1233 10.1.1.1,79 -in on zx0 tcp 10.2.3.1,1234 10.1.1.1,80 -in on zx0 tcp 10.2.3.1,1235 10.1.1.2,80 -in on zx0 tcp 10.2.3.1,1236 10.1.1.3,80 -in on zx0 tcp 10.2.3.1,1237 10.1.1.4,80 -in on zx0 tcp 10.2.3.1,1238 10.1.1.4,80 diff --git a/contrib/ipfilter/test/input/n7_6 b/contrib/ipfilter/test/input/n7_6 deleted file mode 100644 index b31a1de..0000000 --- a/contrib/ipfilter/test/input/n7_6 +++ /dev/null @@ -1,9 +0,0 @@ -in6 on zx0 tcp 10::2:3:1,1230 10:1:1::1,22 -in6 on zx0 tcp 10::2:3:1,1231 10:1:1::1,23 -in6 on zx0 tcp 10::2:3:1,1232 10:1:1::1,50 -in6 on zx0 tcp 10::2:3:1,1233 10:1:1::1,79 -in6 on zx0 tcp 10::2:3:1,1234 10:1:1::1,80 -in6 on zx0 tcp 10::2:3:1,1235 10:1:1::2,80 -in6 on zx0 tcp 10::2:3:1,1236 10:1:1::3,80 -in6 on zx0 tcp 10::2:3:1,1237 10:1:1::4,80 -in6 on zx0 tcp 10::2:3:1,1238 10:1:1::4,80 diff --git a/contrib/ipfilter/test/input/n8 b/contrib/ipfilter/test/input/n8 deleted file mode 100644 index c0a5b3f..0000000 --- a/contrib/ipfilter/test/input/n8 +++ /dev/null @@ -1,34 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP ECHO (ping) exchange -[out,icmp0] -4500 0054 8bc1 0000 ff01 23dc 0202 0202 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 - -[in,icmp0] -4500 0054 3fd5 4000 ff01 1fc1 0404 0404 0a0a 0a01 -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 - -[out,icmp0] -4500 0054 8bc1 0000 ff01 23dc 0202 0202 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 - -[in,icmp0] -4500 0054 3fd5 4000 ff01 1fc1 0404 0404 0a0a 0a01 -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 - diff --git a/contrib/ipfilter/test/input/n8_6 b/contrib/ipfilter/test/input/n8_6 deleted file mode 100644 index 8039f78..0000000 --- a/contrib/ipfilter/test/input/n8_6 +++ /dev/null @@ -1,37 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP ECHO (ping) exchange -[out,icmp0] -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004 -8000 774d 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 - -# ECHO reply -[in,icmp0] -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0010 0010 0010 0000 0000 0000 0000 0001 -8100 7624 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 - -# ECHO request -[out,icmp0] -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004 -8000 774c 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 - -# ECHO reply -[in,icmp0] -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0010 0010 0010 0000 0000 0000 0000 0001 -8100 7623 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 - diff --git a/contrib/ipfilter/test/input/n9 b/contrib/ipfilter/test/input/n9 deleted file mode 100644 index 5c2d3c7..0000000 --- a/contrib/ipfilter/test/input/n9 +++ /dev/null @@ -1,34 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP ECHO (ping) exchange -[in,icmp0] -4500 0054 8bc1 0000 ff01 23dc 0202 0202 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 - -[out,icmp0] -4500 0054 3fd5 4000 ff01 23c5 0a0a 0a01 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 - -[in,icmp0] -4500 0054 8bc1 0000 ff01 23dc 0202 0202 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 - -[out,icmp0] -4500 0054 3fd5 4000 ff01 23c5 0a0a 0a01 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 - diff --git a/contrib/ipfilter/test/input/n9_6 b/contrib/ipfilter/test/input/n9_6 deleted file mode 100644 index 42db09d..0000000 --- a/contrib/ipfilter/test/input/n9_6 +++ /dev/null @@ -1,34 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP ECHO (ping) exchange -[in,icmp0] -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004 -8000 774d 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 - -[out,icmp0] -6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0002 0000 0000 0000 0000 0002 0002 0002 -8100 762c 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 - -[in,icmp0] -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004 -8000 774c 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 - -[out,icmp0] -6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0002 0000 0000 0000 0000 0002 0002 0002 -8100 762b 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 - diff --git a/contrib/ipfilter/test/input/ni1 b/contrib/ipfilter/test/input/ni1 deleted file mode 100644 index 519325f..0000000 --- a/contrib/ipfilter/test/input/ni1 +++ /dev/null @@ -1,59 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP timeout exceeded in reply to a ICMP packet going out. -# 2.2.2.2,44489 -> 4.4.4.4,33438 -[out,df0] -4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404 -afc9 829e 0014 6b10 -0402 0000 3be5 468d 000a cfc3 - -[in,df0] -4500 0038 809a 0000 ff01 2919 0303 0303 0606 0606 -0b00 5f7b 0000 0000 -4500 0028 0000 4000 0111 65b2 0606 0606 0404 0404 -afc9 829e 0014 6308 - -[in,df0] -4500 0044 809a 0000 ff01 290d 0303 0303 0606 0606 -0b00 0939 0000 0000 -4500 0028 0000 4000 0111 65b2 0606 0606 0404 0404 -afc9 829e 0014 6308 -0402 0000 3be5 468d 000a cfc3 - -# 2.2.2.2,2048 -> 4.4.4.4,33438 -[out,df0] -4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404 -0800 829e 0014 12da -0402 0000 3be5 468d 000a cfc3 - -[in,df0] -4500 0038 809a 0000 ff01 2918 0303 0303 0606 0607 -0b00 5f7c 0000 0000 -4500 0028 0000 4000 0111 65b1 0606 0607 0404 0404 -4e20 829e 0014 c4b0 - -[in,df0] -4500 0044 809a 0000 ff01 290c 0303 0303 0606 0607 -0b00 093a 0000 0000 -4500 0028 0000 4000 0111 65b1 0606 0607 0404 0404 -4e20 829e 0014 c4b0 -0402 0000 3be5 468d 000a cfc3 - -# 2.2.2.2,20480 -> 4.4.4.4,33438 -[out,df0] -4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404 -5000 829e 0014 cad9 -0402 0000 3be5 468d 000a cfc3 - -[in,df0] -4500 0038 809a 0000 ff01 2917 0303 0303 0606 0608 -0b00 0775 0000 0000 -4500 0028 0000 4000 0111 65b0 0606 0608 0404 0404 -07d0 829e 0014 6308 - -[in,df0] -4500 0044 809a 0000 ff01 290b 0303 0303 0606 0608 -0b00 093b 0000 0000 -4500 0028 0000 4000 0111 65b0 0606 0608 0404 0404 -07d0 829e 0014 0b00 -0402 0000 3be5 468d 000a cfc3 - diff --git a/contrib/ipfilter/test/input/ni10 b/contrib/ipfilter/test/input/ni10 deleted file mode 100644 index 636c4f1..0000000 --- a/contrib/ipfilter/test/input/ni10 +++ /dev/null @@ -1,29 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -# IP 4.4.4.4 2.2.2.2 TCP(20480,80) -[in,df0] -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 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 acab 0000 0000 -4500 003c 4706 4000 ff06 20a2 0404 0404 0606 0606 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404 -0303 113f 0000 0000 -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 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505 -0303 acab 0000 0000 -4500 003c 4706 4000 ff06 28ab 0404 0404 0202 0201 5000 0050 0000 0001 - diff --git a/contrib/ipfilter/test/input/ni11 b/contrib/ipfilter/test/input/ni11 deleted file mode 100644 index 0650abb..0000000 --- a/contrib/ipfilter/test/input/ni11 +++ /dev/null @@ -1,26 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[in,df0] -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 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 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 - -[out,df0] -4500 0038 809a 0000 ff01 2b1b 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/input/ni12 b/contrib/ipfilter/test/input/ni12 deleted file mode 100644 index c44aacc..0000000 --- a/contrib/ipfilter/test/input/ni12 +++ /dev/null @@ -1,26 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[in,df0] -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 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 10bb 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9c40 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404 -0303 0735 0000 0000 -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 - -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505 -0303 10bb 0000 0000 -4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9c40 0000 0001 - diff --git a/contrib/ipfilter/test/input/ni13 b/contrib/ipfilter/test/input/ni13 deleted file mode 100644 index 70c1952..0000000 --- a/contrib/ipfilter/test/input/ni13 +++ /dev/null @@ -1,231 +0,0 @@ -# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF) -[in,pcn1=192.168.113.3] -4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103 -05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 - -# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF) -[out,pcn1] -4500 002c 69a6 4000 4006 6dd0 c0a8 7103 c0a8 7101 -06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 - -# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF) -[in,pcn1] -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 - -# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF) -[out,pcn1] -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 - -# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF) -[in,pcn1] -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 - -# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF) -[out,pcn1] -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 - -# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF) -[in,pcn1] -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 - -# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP -[in,pcn1] -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 - -# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre] -[out,pcn1] -4500 0020 69a9 0000 ff2f eeaf c0a8 7103 c0a8 7101 -2081 880b 0000 4000 ffff ffff - -# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF) -[out,pcn1] -4500 0028 69aa 4000 4006 6dd0 c0a8 7103 c0a8 7101 -06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 - -# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[out,pcn1] -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 - -# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP -[out,pcn1] -4500 002f 69ac 0000 ff2f ee9d c0a8 7103 c0a8 7101 -3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[in,pcn1] -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 - -# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[in,pcn1] -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 - -# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[out,pcn1] -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 - -# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp -[out,pcn1] -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 - -# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF) -[in,pcn1] -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 - -# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b -[in,pcn1] -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 - -# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2) -[out,pcn1] -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 - -# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b -[in,pcn1] -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 - -# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3) -[out,pcn1] -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 - -# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC -[in,pcn1] -4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103 -3081 880b 000c 0000 0000 0005 -0000 0005 80fd 0104 000a 1206 0100 0001 - -# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1) -[out,pcn1] -4500 002a 69b1 0000 ff2f ee9d c0a8 7103 c0a8 7101 -3081 880b 0006 4000 0000 0006 -0000 0005 80fd 0101 0004 - -# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC -[out,pcn1] -4500 002c 69b2 0000 ff2f ee9a c0a8 7103 c0a8 7101 -3001 880b 000c 4000 0000 0007 -80fd 0404 000a 1206 0100 0001 - -# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[in,pcn1] -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 - -# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[out,pcn1] -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 - -# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp -[in,pcn1] -4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103 -3081 880b 000c 0000 0000 0007 -0000 0008 8021 0401 000a 0206 002d 0f01 - -# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1 -[out,pcn1] -4500 0030 69b4 0000 ff2f ee94 c0a8 7103 c0a8 7101 -3081 880b 000c 4000 0000 0009 -0000 0007 8021 0102 000a 0306 c0a8 0001 - -# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1) -[in,pcn1] -4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103 -3081 880b 0006 0000 0000 0008 -0000 0009 80fd 0201 0004 - -# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6) -[in,pcn1] -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 - -# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6) -[out,pcn1] -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/input/ni14 b/contrib/ipfilter/test/input/ni14 deleted file mode 100644 index 6bc1276..0000000 --- a/contrib/ipfilter/test/input/ni14 +++ /dev/null @@ -1,235 +0,0 @@ -# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF) -[in,pcn1=192.168.113.3] -4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103 -05e7 06bb abf0 4aa5 0000 0000 -7002 faf0 21a1 0000 0204 05b4 0101 0402 - -# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF) -[out,pcn1] -4500 002c 69a6 4000 4006 207b 7f00 0001 c0a8 7101 -06bb 05e7 a564 68da abf0 4aa6 -6012 8000 55f3 0000 0204 05b4 - -# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF) -[in,pcn1] -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 - -# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF) -[out,pcn1] -4500 00c4 69a7 4000 4006 1fe2 7f00 0001 c0a8 7101 -06bb 05e7 a564 68db abf0 4b42 -5018 832c 817a 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 - -# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF) -[in,pcn1] -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 - -# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF) -[out,pcn1] -4500 0048 69a8 4000 4006 205d 7f00 0001 c0a8 7101 -06bb 05e7 a564 6977 abf0 4bea -5018 832c e9a4 0000 0020 0001 1a2b 3c4d -0008 0000 0000 4000 0100 0000 05f5 e100 -0040 0000 0000 0000 - -# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF) -[in,pcn1] -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 - -# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP -[in,pcn1] -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 - -# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre] -[out,pcn1] -4500 0020 69a9 0000 ff2f a15a 7f00 0001 c0a8 7101 -2081 880b 0000 4000 ffff ffff - -# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF) -[out,pcn1] -4500 0028 69aa 4000 4006 207b 7f00 0001 c0a8 7101 -06bb 05e7 a564 6997 abf0 4c02 -5010 832c 686c 0000 - -# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[out,pcn1] -4500 0038 69ab 0000 ff2f a140 7f00 0001 c0a8 7101 -3001 880b 0018 4000 0000 0000 -ff03 c021 0101 0014 0206 0000 0000 0506 -22d9 0cfa 0702 0802 - -# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP -[out,pcn1] -4500 002f 69ac 0000 ff2f a148 7f00 0001 c0a8 7101 -3081 880b 000b 4000 0000 0001 -0000 0000 ff03 c021 0400 0007 0d03 06 - -# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[in,pcn1] -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 - -# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[in,pcn1] -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 - -# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[out,pcn1] -4500 003a 69ad 0000 ff2f a13c 7f00 0001 c0a8 7101 -3081 880b 0016 4000 0000 0002 -0000 0002 ff03 c021 0201 0012 0104 0578 -0506 577f 7c5b 0702 0802 - -# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp -[out,pcn1] -4500 0032 69ae 0000 ff2f a143 7f00 0001 c0a8 7101 -3001 880b 0012 4000 0000 0003 -8021 0101 0010 0306 c0a8 0001 0206 002d -0f01 - -# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF) -[in,pcn1] -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 - -# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b -[in,pcn1] -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 - -# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2) -[out,pcn1] -4500 003e 69af 0000 ff2f a136 7f00 0001 c0a8 7101 -3081 880b 001a 4000 0000 0004 -0000 0003 ff03 c021 0702 0016 0c02 0012 -577f 7c5b 4d53 5241 5356 352e 3130 - -# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b -[in,pcn1] -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 - -# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3) -[out,pcn1] -4500 0044 69b0 0000 ff2f a12f 7f00 0001 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 - -# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC -[in,pcn1] -4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103 -3081 880b 000c 0000 0000 0005 -0000 0005 80fd 0104 000a 1206 0100 0001 - -# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1) -[out,pcn1] -4500 002a 69b1 0000 ff2f a148 7f00 0001 c0a8 7101 -3081 880b 0006 4000 0000 0006 -0000 0005 80fd 0101 0004 - -# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC -[out,pcn1] -4500 002c 69b2 0000 ff2f a145 7f00 0001 c0a8 7101 -3001 880b 000c 4000 0000 0007 -80fd 0404 000a 1206 0100 0001 - -# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[in,pcn1] -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 - -# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[out,pcn1] -4500 0042 69b3 0000 ff2f a12e 7f00 0001 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 - -# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp -[in,pcn1] -4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103 -3081 880b 000c 0000 0000 0007 -0000 0008 8021 0401 000a 0206 002d 0f01 - -# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1 -[out,pcn1] -4500 0030 69b4 0000 ff2f a13f 7f00 0001 c0a8 7101 -3081 880b 000c 4000 0000 0009 -0000 0007 8021 0102 000a 0306 c0a8 0001 - -# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1) -[in,pcn1] -4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103 -3081 880b 0006 0000 0000 0008 -0000 0009 80fd 0201 0004 - -# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6) -[in,pcn1] -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 - -# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6) -[out,pcn1] -4500 002a 69b5 0000 ff2f a144 7f00 0001 c0a8 7101 -3081 880b 0006 4000 0000 000a -0000 0009 80fd 0606 0004 - diff --git a/contrib/ipfilter/test/input/ni15 b/contrib/ipfilter/test/input/ni15 deleted file mode 100644 index 7e7aabd..0000000 --- a/contrib/ipfilter/test/input/ni15 +++ /dev/null @@ -1,235 +0,0 @@ -# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF) -[out,pcn1=192.168.113.3] -4500 0030 5e11 4000 8006 3961 c0a8 7101 -c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 -7002 faf0 21a1 0000 0204 05b4 0101 0402 - -# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF) -[in,pcn1] -4500 002c 69a6 4000 4006 6dd0 c0a8 7103 -c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 -6012 8000 a348 0000 0204 05b4 - -# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF) -[out,pcn1] -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 - -# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF) -[in,pcn1] -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 - -# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF) -[out,pcn1] -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 - -# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF) -[in,pcn1] -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 - -# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF) -[out,pcn1] -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 - -# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP -[out,pcn1] -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 - -# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre] -[in,pcn1] -4500 0020 69a9 0000 ff2f eeaf c0a8 7103 -c0a8 7101 2081 880b 0000 4000 ffff ffff - -# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF) -[in,pcn1] -4500 0028 69aa 4000 4006 6dd0 c0a8 7103 -c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 -5010 832c b5c1 0000 - -# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[in,pcn1] -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 - -# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP -[in,pcn1] -4500 002f 69ac 0000 ff2f ee9d c0a8 7103 -c0a8 7101 3081 880b 000b 4000 0000 0001 -0000 0000 ff03 c021 0400 0007 0d03 06 - -# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[out,pcn1] -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 - -# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[out,pcn1] -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 - -# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[in,pcn1] -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 - -# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp -[in,pcn1] -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 - -# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF) -[out,pcn1] -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 - -# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b -[out,pcn1] -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 - -# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2) -[in,pcn1] -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 - -# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b -[out,pcn1] -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 - -# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3) -[in,pcn1] -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 - -# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC -[out,pcn1] -4500 0030 5e1b 0000 802f 792e c0a8 7101 -c0a8 7103 3081 880b 000c 0000 0000 0005 -0000 0005 80fd 0104 000a 1206 0100 0001 - -# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1) -[in,pcn1] -4500 002a 69b1 0000 ff2f ee9d c0a8 7103 -c0a8 7101 3081 880b 0006 4000 0000 0006 -0000 0005 80fd 0101 0004 - -# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC -[in,pcn1] -4500 002c 69b2 0000 ff2f ee9a c0a8 7103 -c0a8 7101 3001 880b 000c 4000 0000 0007 -80fd 0404 000a 1206 0100 0001 - -# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[out,pcn1] -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 - -# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[in,pcn1] -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 - -# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp -[out,pcn1] -4500 0030 5e1d 0000 802f 792c c0a8 7101 -c0a8 7103 3081 880b 000c 0000 0000 0007 -0000 0008 8021 0401 000a 0206 002d 0f01 - -# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1 -[in,pcn1] -4500 0030 69b4 0000 ff2f ee94 c0a8 7103 -c0a8 7101 3081 880b 000c 4000 0000 0009 -0000 0007 8021 0102 000a 0306 c0a8 0001 - -# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1) -[out,pcn1] -4500 002a 5e1e 0000 802f 7931 c0a8 7101 -c0a8 7103 3081 880b 0006 0000 0000 0008 -0000 0009 80fd 0201 0004 - -# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6) -[out,pcn1] -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 - -# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6) -[in,pcn1] -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/input/ni16 b/contrib/ipfilter/test/input/ni16 deleted file mode 100644 index 362b98d..0000000 --- a/contrib/ipfilter/test/input/ni16 +++ /dev/null @@ -1,235 +0,0 @@ -# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF) -[out,pcn1=192.168.113.1] -4500 0030 5e11 4000 8006 5f07 0a02 0202 -c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 -7002 faf0 4747 0000 0204 05b4 0101 0402 - -# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF) -[in,pcn1] -4500 002c 69a6 4000 4006 6dd0 c0a8 7103 -c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 -6012 8000 a348 0000 0204 05b4 - -# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF) -[out,pcn1] -4500 00c4 5e12 4000 8006 5e72 0a02 0202 -c0a8 7103 05e7 06bb abf0 4aa6 a564 68db -5018 faf0 0847 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 - -# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF) -[in,pcn1] -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 - -# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF) -[out,pcn1] -4500 00d0 5e13 4000 8006 5e65 0a02 0202 -c0a8 7103 05e7 06bb abf0 4b42 a564 6977 -5018 fa54 d1ad 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 - -# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF) -[in,pcn1] -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 - -# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF) -[out,pcn1] -4500 0040 5e14 4000 8006 5ef4 0a02 0202 -c0a8 7103 05e7 06bb abf0 4bea a564 6997 -5018 fa34 0db7 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 ffff ffff ffff ffff - -# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP -[out,pcn1] -4500 0039 5e15 0000 802f 9ed1 0a02 0202 -c0a8 7103 3001 880b 0019 0000 0000 0000 -ff03 c021 0100 0015 0104 0578 0506 577f -7c5b 0702 0802 0d03 06 - -# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre] -[in,pcn1] -4500 0020 69a9 0000 ff2f eeaf c0a8 7103 -c0a8 7101 2081 880b 0000 4000 ffff ffff - -# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF) -[in,pcn1] -4500 0028 69aa 4000 4006 6dd0 c0a8 7103 -c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 -5010 832c b5c1 0000 - -# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[in,pcn1] -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 - -# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP -[in,pcn1] -4500 002f 69ac 0000 ff2f ee9d c0a8 7103 -c0a8 7101 3081 880b 000b 4000 0000 0001 -0000 0000 ff03 c021 0400 0007 0d03 06 - -# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[out,pcn1] -4500 003c 5e16 0000 802f 9ecd 0a02 0202 -c0a8 7103 3081 880b 0018 0000 0000 0001 -0000 0001 ff03 c021 0201 0014 0206 0000 -0000 0506 22d9 0cfa 0702 0802 - -# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[out,pcn1] -4500 0036 5e17 0000 802f 9ed2 0a02 0202 -c0a8 7103 3001 880b 0016 0000 0000 0002 -ff03 c021 0101 0012 0104 0578 0506 577f -7c5b 0702 0802 - -# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[in,pcn1] -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 - -# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp -[in,pcn1] -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 - -# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF) -[out,pcn1] -4500 0040 5e18 4000 8006 5ef0 0a02 0202 -c0a8 7103 05e7 06bb abf0 4c02 a564 6997 -5018 fa34 0d9f 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 0000 0000 ffff ffff - -# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b -[out,pcn1] -4500 0038 5e19 0000 802f 9ece 0a02 0202 -c0a8 7103 3081 880b 0014 0000 0000 0003 -0000 0003 c021 0c02 0012 577f 7c5b 4d53 -5241 5356 352e 3130 - -# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2) -[in,pcn1] -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 - -# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b -[out,pcn1] -4500 003e 5e1a 0000 802f 9ec7 0a02 0202 -c0a8 7103 3081 880b 001a 0000 0000 0004 -0000 0004 c021 0c03 0018 577f 7c5b 4d53 -5241 532d 302d 434c 4159 4d4f 4f52 - -# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3) -[in,pcn1] -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 - -# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC -[out,pcn1] -4500 0030 5e1b 0000 802f 9ed4 0a02 0202 -c0a8 7103 3081 880b 000c 0000 0000 0005 -0000 0005 80fd 0104 000a 1206 0100 0001 - -# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1) -[in,pcn1] -4500 002a 69b1 0000 ff2f ee9d c0a8 7103 -c0a8 7101 3081 880b 0006 4000 0000 0006 -0000 0005 80fd 0101 0004 - -# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC -[in,pcn1] -4500 002c 69b2 0000 ff2f ee9a c0a8 7103 -c0a8 7101 3001 880b 000c 4000 0000 0007 -80fd 0404 000a 1206 0100 0001 - -# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[out,pcn1] -4500 0048 5e1c 0000 802f 9ebb 0a02 0202 -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 - -# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[in,pcn1] -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 - -# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp -[out,pcn1] -4500 0030 5e1d 0000 802f 9ed2 0a02 0202 -c0a8 7103 3081 880b 000c 0000 0000 0007 -0000 0008 8021 0401 000a 0206 002d 0f01 - -# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1 -[in,pcn1] -4500 0030 69b4 0000 ff2f ee94 c0a8 7103 -c0a8 7101 3081 880b 000c 4000 0000 0009 -0000 0007 8021 0102 000a 0306 c0a8 0001 - -# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1) -[out,pcn1] -4500 002a 5e1e 0000 802f 9ed7 0a02 0202 -c0a8 7103 3081 880b 0006 0000 0000 0008 -0000 0009 80fd 0201 0004 - -# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6) -[out,pcn1] -4500 0032 5e1f 0000 802f 9ece 0a02 0202 -c0a8 7103 3001 880b 0012 0000 0000 0009 -80fd 0506 0010 577f 7c5b 003c cd74 0000 -02dc - -# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6) -[in,pcn1] -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/input/ni17 b/contrib/ipfilter/test/input/ni17 deleted file mode 100644 index f9dec94..0000000 --- a/contrib/ipfilter/test/input/ni17 +++ /dev/null @@ -1,6 +0,0 @@ -in on le0 tcp 10.2.2.5,2000 203.1.1.1,80 -in on le0 tcp 10.2.2.6,2000 203.1.1.1,80 -in on le0 tcp 10.2.2.7,2000 203.1.1.1,80 -in on le0 tcp 10.2.2.7,2001 203.1.1.1,80 -in on le0 tcp 10.2.2.8,2000 203.1.1.1,80 -in on le0 tcp 10.2.2.9,2000 203.1.1.1,80 diff --git a/contrib/ipfilter/test/input/ni18 b/contrib/ipfilter/test/input/ni18 deleted file mode 100644 index 4e06f79..0000000 --- a/contrib/ipfilter/test/input/ni18 +++ /dev/null @@ -1,4 +0,0 @@ -in on hme0 tcp 2.2.2.2,3000 192.168.1.2,80 -in on hme0 tcp 2.2.2.2,3000 192.168.1.1,80 -out on hme1 tcp 10.1.2.2,5050 4.5.6.7,80; -out on hme1 tcp 10.1.1.2,5050 4.5.6.7,80; diff --git a/contrib/ipfilter/test/input/ni19 b/contrib/ipfilter/test/input/ni19 deleted file mode 100644 index 3ea706f..0000000 --- a/contrib/ipfilter/test/input/ni19 +++ /dev/null @@ -1,157 +0,0 @@ -# 192.168.113.3.1009 > 10.1.1.4.shell: SYN win 32768 <mss 1460,nop,wscale 0,sackOK,nop,nop,nop,nop,timestamp 0 0> -[out,bge0] -4500 0040 e3fc 4000 4006 1a0b c0a8 7103 -0a01 0104 03f1 0202 6523 90b2 0000 0000 -b002 8000 7d87 0000 0204 05b4 0103 0300 -0402 0101 0101 080a 0000 0000 0000 0000 - -# 10.1.1.4.shell > 10.1.1.1.1009: SYN win 5840 <mss 1460,nop,nop,sackOK,nop,wscale 2> -[in,bge0] -4500 0034 0000 4000 4006 24be 0a01 0104 -0a01 0101 0202 03f1 915a a5c4 6523 90b3 -8012 16d0 0f47 0000 0204 05b4 0101 0402 -0103 0302 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0028 e3fd 4000 4006 1a22 c0a8 7103 -0a01 0104 03f1 0202 6523 90b3 915a a5c5 -5010 832c bd0d 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 002d e3fe 4000 4006 1a1c c0a8 7103 -0a01 0104 03f1 0202 6523 90b3 915a a5c5 -5018 832c 5b98 0000 3130 3038 00 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 7ce5 4000 4006 a7e4 0a01 0104 -0a01 0101 0202 03f1 915a a5c5 6523 90b8 -5010 05b4 612b 0000 - -# 10.1.1.4.1023 > 10.1.1.1.1008: SYN win 5840 <mss 1460,sackOK,timestamp 3791140 0,nop,wscale 2> -[in,bge0] -4500 003c 1186 4000 4006 1330 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a2 0000 0000 -a002 16d0 df6a 0000 0204 05b4 0402 080a -0039 d924 0000 0000 0103 0302 - -# 192.168.113.3.1008 > 10.1.1.4.1023: SYN win 32768 <mss 1460,nop,wscale 0,nop,nop,timestamp 0 3791140,sackOK,nop,nop> -[out,bge0] -4500 0040 e3ff 4000 4006 1a08 c0a8 7103 -0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3 -b012 8000 1e85 0000 0204 05b4 0103 0300 -0101 080a 0000 0000 0039 d924 0402 0101 - -# 10.1.1.4.1023 > 10.1.1.1.1008 -[in,bge0] -4500 0034 1188 4000 4006 1336 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a3 66e5 b811 -8010 05b4 0046 0000 0101 080a 0039 d925 -0000 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0030 e400 4000 4006 1a17 c0a8 7103 -0a01 0104 03f1 0202 6523 90b8 915a a5c5 -5018 832c 0eb6 0000 6461 7272 656e 7200 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 7ce7 4000 4006 a7e2 0a01 0104 -0a01 0101 0202 03f1 915a a5c5 6523 90c0 -5010 05b4 6123 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0053 e401 4000 4006 19f3 c0a8 7103 -0a01 0104 03f1 0202 6523 90c0 915a a5c5 -5018 832c a63d 0000 6461 7272 656e 7200 -7368 202d 6320 2265 6368 6f20 666f 6f20 -3e26 313b 2065 6368 6f20 6261 7220 3e26 -3222 00 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 7ce9 4000 4006 a7e0 0a01 0104 -0a01 0101 0202 03f1 915a a5c5 6523 90eb -5010 05b4 60f8 0000 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0029 7ceb 4000 4006 a7dd 0a01 0104 -0a01 0101 0202 03f1 915a a5c5 6523 90eb -5018 05b4 60ef 0000 00 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0028 e403 4000 4006 1a1c c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5c6 -5010 832c bcd4 0000 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 002c 7ced 4000 4006 a7d8 0a01 0104 -0a01 0101 0202 03f1 915a a5c6 6523 90eb -5018 05b4 8b71 0000 666f 6f0a - -# 10.1.1.4.1023 > 10.1.1.1.1008 -[in,bge0] -4500 0038 118a 4000 4006 1330 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a3 66e5 b811 -8018 05b4 2787 0000 0101 080a 0039 dd6c -0000 0000 6261 720a - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 7cef 4000 4006 a7da 0a01 0104 -0a01 0101 0202 03f1 915a a5ca 6523 90eb -5011 05b4 60f2 0000 - -# 10.1.1.4.1023 > 10.1.1.1.1008 -[in,bge0] -4500 0034 118c 4000 4006 1332 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a7 66e5 b811 -8011 05b4 fbf8 0000 0101 080a 0039 dd6d -0000 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0028 e404 4000 4006 1a1b c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5cb -5010 8328 bcd3 0000 - -# 192.168.113.3.1008 > 10.1.1.4.1023 -[out,bge0] -4500 0034 e405 4000 4006 1a0e c0a8 7103 -0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8 -8010 8328 57d7 0000 0101 080a 0000 0004 -0039 dd6c - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0028 e40a 4000 4006 1a15 c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5cb -5011 832c bcce 0000 - -# 192.168.113.3.1008 > 10.1.1.4.1023 -[out,bge0] -4500 0034 e40b 4000 4006 1a08 c0a8 7103 -0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8 -8011 832c 57d2 0000 0101 080a 0000 0004 -0039 dd6c - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 0004 4000 4006 24c6 0a01 0104 -0a01 0101 0202 03f1 915a a5cb 6523 90ec -5010 05b4 60f1 0000 - -# 10.1.1.4.1023 > 10.1.1.1.1008 -[in,bge0] -4500 0034 118e 4000 4006 1330 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a8 66e5 b812 -8010 05b4 fbf2 0000 0101 080a 0039 dd6e -0000 0004 - diff --git a/contrib/ipfilter/test/input/ni2 b/contrib/ipfilter/test/input/ni2 deleted file mode 100644 index 6dcedb7..0000000 --- a/contrib/ipfilter/test/input/ni2 +++ /dev/null @@ -1,143 +0,0 @@ -# Test of fragmentation required coming from the inside. -[out,xl0] -4510 002c bd0d 4000 3e06 b1d1 0a01 0201 c0a8 0133 -05f6 0077 a664 2485 0000 0000 -6002 4000 b8f2 0000 0204 05b4 - -[in,xl0] -4500 002c ce83 4000 7e06 606b c0a8 0133 0a01 0201 -0077 05f6 fbdf 1a21 a664 2486 -6012 2238 c0a8 0000 0204 05b4 - -[out,xl0] -4510 0028 bd0e 4000 3e06 b1d4 0a01 0201 c0a8 0133 -05f6 0077 a664 2486 fbdf 1a22 -5010 4470 b62d 0000 - -[in,xl0] -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 - -[out,xl0] -4510 0028 bd18 4000 3e06 b1ca 0a01 0201 c0a8 0133 -05f6 0077 a664 2486 fbdf 1a55 -5010 4470 b5fa 0000 - -[out,xl0] -4510 002e bd1e 4000 3e06 b1be 0a01 0201 c0a8 0133 -05f6 0077 a664 2486 fbdf 1a55 -5018 4470 a8e2 0000 0000 0000 0d0a - -[in,xl0] -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 - -[in,xl0] -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 - -[out,xl0] -4500 0038 d71d 4000 4001 7d22 c0a8 6401 c0a8 0133 -0304 da99 0000 05a0 -4500 05dc e483 4000 7e06 44bb c0a8 0133 0a01 0201 -0077 05f6 fbdf 1a75 - diff --git a/contrib/ipfilter/test/input/ni20 b/contrib/ipfilter/test/input/ni20 deleted file mode 100644 index 065ed27..0000000 --- a/contrib/ipfilter/test/input/ni20 +++ /dev/null @@ -1,157 +0,0 @@ -# 192.168.113.3.1009 > 10.1.1.4.shell: SYN win 32768 <mss 1460,nop,wscale 0,sackOK,nop,nop,nop,nop,timestamp 0 0> -[in,bge0] -4500 0040 e3fc 4000 4006 1a0b c0a8 7103 -0a01 0104 03f1 0202 6523 90b2 0000 0000 -b002 8000 7d87 0000 0204 05b4 0103 0300 -0402 0101 0101 080a 0000 0000 0000 0000 - -# 192.168.113.4.shell > 192.168.113.3.1009: SYN win 5840 <mss 1460,nop,nop,sackOK,nop,wscale 2> -[out,bge0] -4500 0034 0000 4000 4006 d76b c0a8 7104 -c0a8 7103 0202 03f1 915a a5c4 6523 90b3 -8012 16d0 c1f4 0000 0204 05b4 0101 0402 -0103 0302 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[in,bge0] -4500 0028 e3fd 4000 4006 1a22 c0a8 7103 -0a01 0104 03f1 0202 6523 90b3 915a a5c5 -5010 832c bd0d 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[in,bge0] -4500 002d e3fe 4000 4006 1a1c c0a8 7103 -0a01 0104 03f1 0202 6523 90b3 915a a5c5 -5018 832c 5b98 0000 3130 3038 00 - -# 192.168.113.4.shell > 192.168.113.3.1009 -[out,bge0] -4500 0028 7ce5 4000 4006 5a92 c0a8 7104 -c0a8 7103 0202 03f1 915a a5c5 6523 90b8 -5010 05b4 13d9 0000 - -# 192.168.113.4.1023 > 192.168.113.3.1008: SYN win 5840 <mss 1460,sackOK,timestamp 3791140 0,nop,wscale 2> -[out,bge0] -4500 003c 1186 4000 4006 c5dd c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000 -a002 16d0 9218 0000 0204 05b4 0402 080a -0039 d924 0000 0000 0103 0302 - -# 192.168.113.3.1008 > 10.1.1.4.1023: SYN win 32768 <mss 1460,nop,wscale 0,nop,nop,timestamp 0 3791140,sackOK,nop,nop> -[in,bge0] -4500 0040 e3ff 4000 4006 1a08 c0a8 7103 -0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3 -b012 8000 1e85 0000 0204 05b4 0103 0300 -0101 080a 0000 0000 0039 d924 0402 0101 - -# 192.168.113.4.1023 > 192.168.113.3.1008 ACK -[out,bge0] -4500 0034 1188 4000 4006 c5e3 c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 -8010 05b4 b2f3 0000 0101 080a 0039 d925 -0000 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell PUSH+ACK -[in,bge0] -4500 0030 e400 4000 4006 1a17 c0a8 7103 -0a01 0104 03f1 0202 6523 90b8 915a a5c5 -5018 832c 0eb6 0000 6461 7272 656e 7200 - -# 192.168.113.4.shell > 192.168.113.3.1009 ACK -[out,bge0] -4500 0028 7ce7 4000 4006 5a90 c0a8 7104 -c0a8 7103 0202 03f1 915a a5c5 6523 90c0 -5010 05b4 13d1 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell PUSH+ACK -[in,bge0] -4500 0053 e401 4000 4006 19f3 c0a8 7103 -0a01 0104 03f1 0202 6523 90c0 915a a5c5 -5018 832c a63d 0000 6461 7272 656e 7200 -7368 202d 6320 2265 6368 6f20 666f 6f20 -3e26 313b 2065 6368 6f20 6261 7220 3e26 -3222 00 - -# 192.168.113.4.shell > 192.168.113.3.1009 ACK -[out,bge0] -4500 0028 7ce9 4000 4006 5a8e c0a8 7104 -c0a8 7103 0202 03f1 915a a5c5 6523 90eb -5010 05b4 13a6 0000 - -# 192.168.113.4.shell > 192.168.113.3.1009 PUSH+ACK -[out,bge0] -4500 0029 7ceb 4000 4006 5a8b c0a8 7104 -c0a8 7103 0202 03f1 915a a5c5 6523 90eb -5018 05b4 139d 0000 00 - -# 192.168.113.3.1009 > 10.1.1.4.shell ACK -[in,bge0] -4500 0028 e403 4000 4006 1a1c c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5c6 -5010 832c bcd4 0000 - -# 192.168.113.4.shell > 192.168.113.3.1009 PUSH+ACK -[out,bge0] -4500 002c 7ced 4000 4006 5a86 c0a8 7104 -c0a8 7103 0202 03f1 915a a5c6 6523 90eb -5018 05b4 3e1f 0000 666f 6f0a - -# 192.168.113.4.1023 > 192.168.113.3.1008 PUSH+ACK -[out,bge0] -4500 0038 118a 4000 4006 c5dd c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 -8018 05b4 da34 0000 0101 080a 0039 dd6c -0000 0000 6261 720a - -# 192.168.113.4.shell > 192.168.113.3.1009 FIN+ACK -[out,bge0] -4500 0028 7cef 4000 4006 5a88 c0a8 7104 -c0a8 7103 0202 03f1 915a a5ca 6523 90eb -5011 05b4 13a0 0000 - -# 192.168.113.4.1023 > 192.168.113.3.1008 FIN+ACK -[out,bge0] -4500 0034 118c 4000 4006 c5df c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811 -8011 05b4 aea6 0000 0101 080a 0039 dd6d -0000 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell ACK -[in,bge0] -4500 0028 e404 4000 4006 1a1b c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5cb -5010 8328 bcd3 0000 - -# 192.168.113.3.1008 > 10.1.1.4.1023 ACK -[in,bge0] -4500 0034 e405 4000 4006 1a0e c0a8 7103 -0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8 -8010 8328 57d7 0000 0101 080a 0000 0004 -0039 dd6c - -# 192.168.113.3.1009 > 10.1.1.4.shell FIN+ACK -[in,bge0] -4500 0028 e40a 4000 4006 1a15 c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5cb -5011 832c bcce 0000 - -# 192.168.113.3.1008 > 10.1.1.4.1023 FIN+ACK -[in,bge0] -4500 0034 e40b 4000 4006 1a08 c0a8 7103 -0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8 -8011 832c 57d2 0000 0101 080a 0000 0004 -0039 dd6c - -# 192.168.113.4.shell > 192.168.113.3.1009 ACK -[out,bge0] -4500 0028 0004 4000 4006 d773 c0a8 7104 -c0a8 7103 0202 03f1 915a a5cb 6523 90ec -5010 05b4 139f 0000 - -# 192.168.113.4.1023 > 192.168.113.3.1008 ACK -[out,bge0] -4500 0034 118e 4000 4006 c5dd c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a8 66e5 b812 -8010 05b4 aea0 0000 0101 080a 0039 dd6e -0000 0004 - diff --git a/contrib/ipfilter/test/input/ni21 b/contrib/ipfilter/test/input/ni21 deleted file mode 100644 index daf741e..0000000 --- a/contrib/ipfilter/test/input/ni21 +++ /dev/null @@ -1,3 +0,0 @@ -out on lan0 2.2.2.2 3.3.3.3 -in on lan0 3.3.3.3 4.4.4.4 -out on lan0 2.2.2.2 3.3.3.3 diff --git a/contrib/ipfilter/test/input/ni23 b/contrib/ipfilter/test/input/ni23 deleted file mode 100644 index 938b7b8..0000000 --- a/contrib/ipfilter/test/input/ni23 +++ /dev/null @@ -1,3 +0,0 @@ -in on le0 udp 3.3.3.1,6700 1.1.2.3,4500 -in on hme0 udp 2.2.2.2,4500 4.4.4.4,6700 -out on bge0 udp 2.2.2.2,4500 3.3.3.1,6700 diff --git a/contrib/ipfilter/test/input/ni3 b/contrib/ipfilter/test/input/ni3 deleted file mode 100644 index e4d12fe..0000000 --- a/contrib/ipfilter/test/input/ni3 +++ /dev/null @@ -1,20 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[out,df0] -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 - -[in,df0] -4500 0038 809a 0000 ff01 2919 0303 0303 0606 0606 -0303 acab 0000 0000 -4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 -5000 0050 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[in,df0] -4500 0058 809a 0000 ff01 28f9 0303 0303 0606 0606 -0303 113f 0000 0000 -4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 -5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - diff --git a/contrib/ipfilter/test/input/ni4 b/contrib/ipfilter/test/input/ni4 deleted file mode 100644 index dac9f53..0000000 --- a/contrib/ipfilter/test/input/ni4 +++ /dev/null @@ -1,18 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[out,df0] -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 - -[in,df0] -4500 0038 809a 0000 ff01 2919 0303 0303 0606 0606 -0303 606b 0000 0000 4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 9c40 0050 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[in,df0] -4500 0058 809a 0000 ff01 28f9 0303 0303 0606 0606 -0303 113f 0000 0000 -4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 -9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - diff --git a/contrib/ipfilter/test/input/ni5 b/contrib/ipfilter/test/input/ni5 deleted file mode 100644 index 4b32e49..0000000 --- a/contrib/ipfilter/test/input/ni5 +++ /dev/null @@ -1,363 +0,0 @@ -# 32818,21 SYN -[out,ppp0] -4500 002c 10c9 4000 ff06 3289 c0a8 0103 -96cb e002 8032 0015 bd6b c9c8 0000 0000 -6002 2238 35f9 0000 0204 05b4 - -# 21,32818 SYN+ACK -[in,ppp0] -4500 002c ffdd 4000 ef06 131e 96cb e002 -0101 0101 0015 8032 3786 76c4 bd6b c9c9 -6012 269c 4313 0000 0204 0584 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10ca 4000 ff06 328c c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 76c5 -5010 269c 9af6 0000 - -# ACK+PUSH "[220-coombs.anu.edu.au NcFTPd Server (free educational license) ready.\r\n" -[in,ppp0] -4500 006f ffde 4000 ef06 12da 96cb e002 -0101 0101 0015 8032 3786 76c5 bd6b c9c9 -5018 269c 5628 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 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10cb 4000 ff06 328b c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 770c -5010 269c 9aaf 0000 - -# 21,32818 ACK+PUSH -# "220-Maintained by RSSS and RSPAS IT Staff (previously known as Coombs Computing Unit)\r\n -# "220-Any problems contact ftpmaster@coombs.anu.edu.au\r\n" -# "220-\r\n220 \r\n" -[in,ppp0] -4500 00c7 ffdf 4000 ef06 1281 96cb e002 -0101 0101 0015 8032 3786 770c bd6b c9c9 -5018 269c d030 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 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10cc 4000 ff06 328a c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 77ab -5010 269c 9a10 0000 - -# 32818,21 ACK+PUSH "USER anonymous\r\n" -[out,ppp0] -4500 0038 10cd 4000 ff06 3279 c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 77ab -5018 269c 121c 0000 5553 4552 2061 6e6f -6e79 6d6f 7573 0d0a - -# 21,32818 ACK -[in,ppp0] -4500 0028 ffe0 4000 ef06 131f 96cb e002 -0101 0101 0015 8032 3786 77ab bd6b c9d9 -5010 269c 59aa 0000 - -# 21,32818 ACK+PUSH "331 Guest login ok, send your complete e-mail address as password.\r\n" -[in,ppp0] -4500 006c ffe1 4000 ef06 12da 96cb e002 -0101 0101 0015 8032 3786 77ab bd6b c9d9 -5018 269c 6fb9 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 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10ce 4000 ff06 3288 c0a8 0103 -96cb e002 8032 0015 bd6b c9d9 3786 77ef -5010 269c 99bc 0000 - -# 32818,21 ACK+PUSH "PASS avalon@\r\n" -[out,ppp0] -4500 0036 10cf 4000 ff06 3279 c0a8 0103 -96cb e002 8032 0015 bd6b c9d9 3786 77ef -5018 269c 7795 0000 5041 5353 2061 7661 -6c6f 6e40 0d0a - -# 21,32818 ACK+PUSH -# "230-You are user #4 of 50 simultaneous users allowed.\r\n" -[in,ppp0] -4500 005f ffe2 4000 ef06 12e6 96cb e002 -0101 0101 0015 8032 3786 77ef bd6b c9e7 -5018 269c 4908 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 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10d0 4000 ff06 3286 c0a8 0103 -96cb e002 8032 0015 bd6b c9e7 3786 7826 -5010 269c 9977 0000 - -# 21,32818 ACK+PUSH -# "230-\r\n230-\r\n" -# "230-Hi. We're cleaning up. Any feedback most welcome. 10 Aug 00\r\n" -# "230-\r\n230 Logged in anonymously.\r\n" -[in,ppp0] -4500 0099 ffe3 4000 ef06 12ab 96cb e002 -0101 0101 0015 8032 3786 7826 bd6b c9e7 -5018 269c 9343 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 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10d1 4000 ff06 3285 c0a8 0103 -96cb e002 8032 0015 bd6b c9e7 3786 7897 -5010 269c 9906 0000 - -# 32818,21 ACK "TYPE I\r\n" -[out,ppp0] -4500 0030 10d2 4000 ff06 327c c0a8 0103 -96cb e002 8032 0015 bd6b c9e7 3786 7897 -5018 269c c704 0000 5459 5045 2049 0d0a - -# 21,32818 "200 Type okay.\r\n" -[in,ppp0] -4500 0038 ffe4 4000 ef06 130b 96cb e002 -0101 0101 0015 8032 3786 7897 bd6b c9ef -5018 269c 1f58 0000 3230 3020 5479 7065 -206f 6b61 792e 0d0a - -# 32818,21 ACK -[out,ppp0] -4500 0028 10d3 4000 ff06 3283 c0a8 0103 -96cb e002 8032 0015 bd6b c9ef 3786 78a7 -5010 269c 98ee 0000 - -# 32818,21 ACK "PORT 192,158,1,3,128,51\r\n" -[out,ppp0] -4500 0041 10d4 4000 ff06 3269 c0a8 0103 -96cb e002 8032 0015 bd6b c9ef 3786 78a7 -5018 269c 1c4d 0000 504f 5254 2031 3932 -2c31 3638 2c31 2c33 2c31 3238 2c35 310d -0a - -# 32818,21 ACK "200 PORT command successful.\r\n" -[in,ppp0] -4500 0046 ffe5 4000 ef06 12fc 96cb e002 -0101 0101 0015 8032 3786 78a7 bd6b ca08 -5018 269c 9b71 0000 3230 3020 504f 5254 -2063 6f6d 6d61 6e64 2073 7563 6365 7373 -6675 6c2e 0d0a - -# 32818,21 "TYPE A\r\n" -[out,ppp0] -4500 0030 10d5 4000 ff06 3279 c0a8 0103 -96cb e002 8032 0015 bd6b ca08 3786 78c5 -5018 269c c6bd 0000 5459 5045 2041 0d0a - -# 21,32818 "200 Type okay.\r\n" -[in,ppp0] -4500 0038 ffe6 4000 ef06 1309 96cb e002 -0101 0101 0015 8032 3786 78c5 bd6b ca10 -5018 269c 1f09 0000 3230 3020 5479 7065 -206f 6b61 792e 0d0a - -# 32818,21 "NLST\r\n" -[out,ppp0] -4500 002e 10d6 4000 ff06 327a c0a8 0103 -96cb e002 8032 0015 bd6b ca10 3786 78d5 -5018 269c e9e6 0000 4e4c 5354 0d0a - -# 20,32819 SYN -[in,ppp0] -4500 002c ffe7 4000 ef06 1314 96cb e002 -0101 0101 0014 8033 d9f8 11d4 0000 0000 -6002 2238 913a 0000 0204 0584 - -# 32819,20 SYN+ACK -[out,ppp0] -4500 002c 10d7 4000 ff06 327b c0a8 0103 -96cb e002 8033 0014 bd78 5c12 d9f8 11d5 -6012 02f8 d734 0000 0204 0584 - -# 20,32819 ACK -[in,ppp0] -4500 0028 ffe8 4000 ef06 1317 96cb e002 -0101 0101 0014 8033 d9f8 11d5 bd78 5c13 -5010 269c 8ac7 0000 - -# 21,32818 ACK "150 Opening ASCII mode data connection for /bin/ls.\r\n" -[in,ppp0] -4500 005d ffe9 4000 ef06 12e1 96cb e002 -0101 0101 0015 8032 3786 78d5 bd6b ca16 -5018 269c ae7e 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 - -# 32819,20 ACK -[out,ppp0] -4500 0028 10d8 4000 ff06 327e c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 11d5 -5010 6348 8e71 0000 - -# 32818,21 ACK+PUSH "PORT 192,158,1,3,128,52\r\n" -[out,ppp0] -4500 0041 10d9 4000 ff06 3264 c0a8 0103 -96cb e002 8032 0015 bd6b ca16 3786 78d5 -5018 269c 1af8 0000 504f 5254 2031 3932 -2c31 3638 2c31 2c33 2c31 3238 2c35 320d -0a - -# 21,32818 ACK+PUSH "200 PORT command successful\r\n" -[in,ppp0] -4500 0046 ffea 4000 ef06 12f7 96cb e002 -0101 0101 0015 8032 3786 78d5 bd6b ca2f -5018 269c 9b1c 0000 3230 3020 504f 5254 -2063 6f6d 6d61 6e64 2073 7563 6365 7373 -6675 6c2e 0d0a - -# 32818,21 ACK+PUSH "TYPE A\r\n" -[out,ppp0] -4500 0030 10da 4000 ff06 3274 c0a8 0103 -96cb e002 8032 0015 bd6b ca2f 3786 78f3 -5018 269c c668 0000 5459 5045 2041 0d0a - -# 21,32818 "200 Type okay.\r\n" -[in,ppp0] -4500 0038 ffeb 4000 ef06 1304 96cb e002 -0101 0101 0015 8032 3786 78f3 bd6b ca37 -5018 269c 1ea4 0000 3230 3020 5479 7065 -206f 6b61 793e 0d0a - -# 32818,21 ACK+PUSH "NLST\r\n" -[out,ppp0] -4500 002e 10db 4000 ff06 3275 c0a8 0103 -96cb e002 8032 0015 bd6b ca37 3786 7903 -5018 269c e991 0000 4e4c 5354 0d0a - -# 20,32820 2nd connection SYN -[in,ppp0] -4500 002c ffec 4000 ef06 130f 96cb e002 -0101 0101 0014 8034 d9f8 11d4 0000 0000 -6002 2238 9139 0000 0204 0584 - -# 32820,20 SYN+ACK -[out,ppp0] -4500 002c 10d7 4000 ff06 327b c0a8 0103 -96cb e002 8034 0014 bd78 5c12 d9f8 11d5 -6012 02f8 d733 0000 0204 0584 - -# 20,32820 ACK -[in,ppp0] -4500 0028 ffec 4000 ef06 1313 96cb e002 -0101 0101 0014 8034 d9f8 11d4 0000 0000 -5010 2238 a8b7 0000 - -# 20,32819 ACK+PUSH -[in,ppp0] -4500 0063 ffed 4000 ef06 12d7 96cb e002 -0101 0101 0014 8033 d9f8 11d5 bd78 5c13 -5018 269c 62bf 0000 636f 6f6d 6273 7061 -7065 7273 0d0a 6465 7074 730d 0a66 6f75 -6e64 2d66 696c 6573 0d0a 696e 636f 6d69 -6e67 0d0a 6e6c 632d 7465 7374 0d0a 7075 -620d 0a - -# 32819,20 ACK -[out,ppp0] -4500 0028 10dc 4000 ff06 327a c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1210 -5010 6348 8e36 0000 - -# 20,32819 FIN+ACK -[in,ppp0] -4500 0028 ffee 4000 ef06 1311 96cb e002 -0101 0101 0014 8033 d9f8 1210 bd78 5c13 -5011 269c 8a8b 0000 - -# 32819,20 ACK -[out,ppp0] -4500 0028 10dd 4000 ff06 3279 c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1211 -5010 6348 8e35 0000 - -# 32819,20 FIN+ACK -[out,ppp0] -4500 0028 10dd 4000 ff06 3279 c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1211 -5011 6348 8e34 0000 - -# 20,32819 ACK -[in,ppp0] -4500 0028 ffef 4000 ef06 1310 96cb e002 -0101 0101 0014 8033 d9f8 1211 bd78 5c14 -5010 269c 8a8a 0000 - -# 21,32818 220 "226 Listing completed.\r\n" -[in,ppp0] -4500 0040 fff0 4000 ef06 12f7 96cb e002 -0101 0101 0015 8032 3786 7903 bd6b ca37 -5018 269c 3c32 0000 3232 3620 4c69 7374 -696e 6720 636f 6d70 6c65 7465 642e 0d0a - -# 32818,21 ACK -[out,ppp0] -4500 0028 10e0 4000 ff06 3276 c0a8 0103 -96cb e002 8032 0015 bd6b ca37 3786 791b -5010 269c 9832 0000 - -# 32818,21 "QUIT\r\n" -[out,ppp0] -4500 002e 10e1 4000 ff06 326f c0a8 0103 -96cb e002 8032 0015 bd6b ca37 3786 791b -5018 269c f070 0000 5155 4954 0d0a - -# 21,32818 "221 Goodbye." -[in,ppp0] -4500 0036 fff2 4000 ef06 12ff 96cb e002 -0101 0101 0015 8032 3786 791b bd6b ca3d -5018 269c 68e8 0000 3232 3120 476f 6f64 -6279 652e 0d0a - -# 32818,21 ACK+FIN -[out,ppp0] -4500 0028 10e2 4000 ff06 3274 c0a8 0103 -96cb e002 8032 0015 bd6b ca3d 3786 7929 -5011 269c 981d 0000 - -# 21,32818 ACK+FIN -[in,ppp0] -4500 0028 fff3 4000 ef06 130c 96cb e002 -0101 0101 0015 8032 3786 7929 bd6b ca3d -5011 269c 57c7 0000 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10e3 4000 ff06 3273 c0a8 0103 -96cb e002 8032 0015 bd6b ca3d 3786 792a -5010 269c 981d 0000 - -# 21,32818 ACK -[in,ppp0] -4500 0028 fff4 4000 ef06 130b 96cb e002 -0101 0101 0015 8032 3786 792a bd6b ca3e -5010 269c 57c6 0000 - diff --git a/contrib/ipfilter/test/input/ni6 b/contrib/ipfilter/test/input/ni6 deleted file mode 100644 index 70e80c0..0000000 --- a/contrib/ipfilter/test/input/ni6 +++ /dev/null @@ -1,54 +0,0 @@ -[in,nf0] -4500 0054 cd8a 4000 ff11 20ba c0a8 0601 -c0a8 0602 8075 006f 0040 d36d 3e1d d249 -0000 0000 0000 0002 0001 86a0 0000 0002 -0000 0003 0000 0000 0000 0000 0000 0000 -0000 0000 0001 86a3 0000 0003 0000 0011 -0000 0000 - -[out,qfe0] -4500 0054 cd8a 4000 ff11 1fbb c0a8 0601 -c0a8 0701 8075 006f 0040 d26e 3e1d d249 -0000 0000 0000 0002 0001 86a0 0000 0002 -0000 0003 0000 0000 0000 0000 0000 0000 -0000 0000 0001 86a3 0000 0003 0000 0011 -0000 0000 - -[in,qfe0] -4500 0038 cd83 4000 ff11 1edd c0a8 0701 -c0a8 0702 006f 8075 0024 d704 3e1d d249 -0000 0001 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0801 - -[out,nf0] -4500 0038 cd83 4000 ff11 1fde c0a8 0701 -c0a8 0601 006f 8075 0024 d805 3e1d d249 -0000 0001 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0801 - -[in,nf0] -4500 0044 d5a6 4000 ff11 18ae c0a8 0601 -c0a8 0602 80df 0801 0030 04f0 3e10 1fb1 -0000 0000 0000 0002 0001 86a3 0000 0002 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -[out,qfe0] -4500 0044 d5a6 4000 ff11 17af c0a8 0601 -c0a8 0701 80df 0801 0030 03f1 3e10 1fb1 -0000 0000 0000 0002 0001 86a3 0000 0002 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -[in,qfe0] -4500 0034 0000 4000 fe11 ed64 c0a8 0701 -c0a8 0702 0801 80df 0020 89b7 3e10 1fb1 -0000 0001 0000 0000 0000 0000 0000 0000 -0000 0000 - -[out,nf0] -4500 0034 0000 4000 fe11 ee65 c0a8 0701 -c0a8 0601 0801 80df 0020 0000 3e10 1fb1 -0000 0001 0000 0000 0000 0000 0000 0000 -0000 0000 - diff --git a/contrib/ipfilter/test/input/ni7 b/contrib/ipfilter/test/input/ni7 deleted file mode 100644 index 8d07937..0000000 --- a/contrib/ipfilter/test/input/ni7 +++ /dev/null @@ -1,13 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP timeout exceeded in reply to a ICMP packet coming in. -[in,df0] -4500 0028 4706 4000 0111 26b4 0404 0404 0202 0202 -afc9 829e 0014 6b10 0402 0000 -3be5 468d 000a cfc3 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0b00 0125 0000 0000 -4500 0028 4706 4000 0111 1eac 0404 0404 0606 0606 -afc9 829e 0014 c15e - diff --git a/contrib/ipfilter/test/input/ni8 b/contrib/ipfilter/test/input/ni8 deleted file mode 100644 index 72205ee..0000000 --- a/contrib/ipfilter/test/input/ni8 +++ /dev/null @@ -1,27 +0,0 @@ -#v tos len id off ttl p sum src dst -[in,df0] -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 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 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 - -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going in) -[out,df0] -4500 0038 809a 0000 ff01 2b1b 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/input/ni9 b/contrib/ipfilter/test/input/ni9 deleted file mode 100644 index b8f4599..0000000 --- a/contrib/ipfilter/test/input/ni9 +++ /dev/null @@ -1,27 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[in,df0] -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 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 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 - -[out,df0] -4500 0038 809a 0000 ff01 2b1b 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/input/p1 b/contrib/ipfilter/test/input/p1 deleted file mode 100644 index f6753fa..0000000 --- a/contrib/ipfilter/test/input/p1 +++ /dev/null @@ -1,8 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p10 b/contrib/ipfilter/test/input/p10 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p10 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/input/p11 b/contrib/ipfilter/test/input/p11 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p11 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/input/p12 b/contrib/ipfilter/test/input/p12 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p12 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/input/p13 b/contrib/ipfilter/test/input/p13 deleted file mode 100644 index f6753fa..0000000 --- a/contrib/ipfilter/test/input/p13 +++ /dev/null @@ -1,8 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p2 b/contrib/ipfilter/test/input/p2 deleted file mode 100644 index f6753fa..0000000 --- a/contrib/ipfilter/test/input/p2 +++ /dev/null @@ -1,8 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p3 b/contrib/ipfilter/test/input/p3 deleted file mode 100644 index 4a6666b..0000000 --- a/contrib/ipfilter/test/input/p3 +++ /dev/null @@ -1,12 +0,0 @@ -in 1.1.1.1 1.2.1.1 -in 1.2.1.1 1.1.1.1 -out 1.1.1.1 1.2.1.1 -out 1.2.1.1 1.1.1.1 -in 2.2.2.2 2.1.2.1 -out 2.1.2.1 2.2.2.2 -in 3.3.1.1 3.1.3.1 -out 3.1.3.1 3.3.1.1 -in 4.4.1.1 4.1.4.1 -out 4.1.4.1 4.4.1.1 -in 5.5.1.1 5.1.5.1 -out 5.1.5.1 5.5.1.1 diff --git a/contrib/ipfilter/test/input/p4 b/contrib/ipfilter/test/input/p4 deleted file mode 100644 index 46c0998..0000000 --- a/contrib/ipfilter/test/input/p4 +++ /dev/null @@ -1,12 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 2.2.2.1 1.2.1.1 -out 2.2.2.1 1.2.1.2 -out 2.2.0.1 1.2.1.1 -out 2.2.0.1 1.2.1.3 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p5 b/contrib/ipfilter/test/input/p5 deleted file mode 100644 index f6753fa..0000000 --- a/contrib/ipfilter/test/input/p5 +++ /dev/null @@ -1,8 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p6 b/contrib/ipfilter/test/input/p6 deleted file mode 100644 index 37c26ce..0000000 --- a/contrib/ipfilter/test/input/p6 +++ /dev/null @@ -1,2 +0,0 @@ -in 131.107.1.1 10.1.1.1 -out 10.1.1.1 131.107.1.1 diff --git a/contrib/ipfilter/test/input/p7 b/contrib/ipfilter/test/input/p7 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p7 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/input/p9 b/contrib/ipfilter/test/input/p9 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p9 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/intest b/contrib/ipfilter/test/intest deleted file mode 100755 index bcafe76..0000000 --- a/contrib/ipfilter/test/intest +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -/bin/cp /dev/null results/$name -../ipnat -Rnvf regress/$name 2>/dev/null > results/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/ipflib.sh b/contrib/ipfilter/test/ipflib.sh deleted file mode 100644 index 82d473d..0000000 --- a/contrib/ipfilter/test/ipflib.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# -# (C)opyright 2012 by Darren Reed. -# -# See the IPFILTER.LICENCE file for details on licencing. -# -test_init() { - mkdir -p results - find_touch - set_core $name 1 -} - -set_core() { - if [ -n "${FINDLEAKS}" -a -x /bin/mdb ] ; then - _findleaks=1 - else - _findleaks=0 - fi - if [ -x /bin/coreadm ] ; then - _cn="$1.$2.core" - coreadm -p "${PWD}/$_cn" - else - _cn= - fi -} - -test_end_leak() { - if [ $1 -ne 0 ] ; then - if [ ${_findleaks} = 1 -a -f $_cn ] ; then - echo "==== ${name}:${n} ====" >> leaktest - echo '::findleaks' | mdb ../i86/ipftest $_cn >> leaktest - rm $_cn - else - exit 2; - fi - fi -} - -check_results() { - cmp expected/$1 results/$1 - status=$? - if [ $status = 0 ] ; then - $TOUCH $1 - fi -} - -find_touch() { - if [ -f /bin/touch ] ; then - TOUCH=/bin/touch - else - if [ -f /usr/bin/touch ] ; then - TOUCH=/usr/bin/touch - else - if [ -f /usr/ucb/touch ] ; then - TOUCH=/usr/ucb/touch - fi - fi - fi -} diff --git a/contrib/ipfilter/test/iptest b/contrib/ipfilter/test/iptest deleted file mode 100644 index 70fd9d8..0000000 --- a/contrib/ipfilter/test/iptest +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -/bin/cp /dev/null results/$name -../ippool -f regress/$name -nRv 2>/dev/null > results/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/itest b/contrib/ipfilter/test/itest deleted file mode 100644 index 84b0454..0000000 --- a/contrib/ipfilter/test/itest +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -/bin/cp /dev/null results/$name -case $3 in -ipf) - ../ipf -Rnvf regress/$name 2>/dev/null > results/$name - status=$? - if [ $status -ne 0 ] ; then - echo "ERROR: ../ipf -Rnvf regress/$name" - fi - ;; -ipftest) - unset FINDLEAKS - ../ipftest -D -r regress/$name -i /dev/null > results/$name - status=$? - if [ $status -ne 0 ] ; then - echo "ERROR: ../ipftest -D -r regress/$name" - fi - ;; -esac -if [ $status -eq 0 ] ; then - check_results $name -fi -exit $status diff --git a/contrib/ipfilter/test/logtest b/contrib/ipfilter/test/logtest deleted file mode 100755 index a3a9671..0000000 --- a/contrib/ipfilter/test/logtest +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -name=$1 -format=$2 - -. ./ipflib.sh - -test_init - -echo "$name..."; - -case `uname -s` in -OSF1) - GMT=: - ;; -*) - GMT=GMT - ;; -esac - -n=1 -/bin/cp /dev/null results/$name -/bin/cp /dev/null results/$name.b - -( while read rule; do - /bin/rm -f logout - set_core $name $n - echo $rule >> results/$name - echo $rule | ../ipftest -br - -F $format -i input/$name -l logout > /dev/null & - back=$! - wait $back - test_end_leak $? - n=`expr $n + 1` - - TZ=$GMT ../ipmon -P /dev/null -f logout >> results/$1 - echo "--------" >> results/$1 - TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b - echo "--------" >> results/$1.b -done ) < regress/$1 -../ipftest -br regress/$1 -F $format -i input/$1 -l logout > /dev/null -TZ=$GMT ../ipmon -P /dev/null -f logout >> results/$1 -echo "--------" >> results/$1 -TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b -echo "--------" >> results/$1.b - -cmp expected/$1 results/$1 -status=$? -if [ $status -ne 0 ] ; then - exit $status -fi -cmp expected/$1.b results/$1.b -status=$? -if [ $status -ne 0 ] ; then - exit $status -fi -/bin/rm -f logout -$TOUCH $1 -exit 0 diff --git a/contrib/ipfilter/test/mtest b/contrib/ipfilter/test/mtest deleted file mode 100755 index aed9fb9..0000000 --- a/contrib/ipfilter/test/mtest +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -name=$1 -format=$2 - -. ./ipflib.sh - -test_init - -echo "$name..."; - -/bin/cp /dev/null results/$1 - -../ipftest -F $format $4 -Rbr regress/$name -i input/$name > results/$name & -back=$! -wait $back -test_end_leak $? -echo "--------" >> results/$name - -check_results $name -exit $status diff --git a/contrib/ipfilter/test/natipftest b/contrib/ipfilter/test/natipftest deleted file mode 100755 index 493f18b..0000000 --- a/contrib/ipfilter/test/natipftest +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -mode=$1 -name=$2 -input=$3 -output=$4 -n=1 - -. ./ipflib.sh - -test_init - -shift -if [ $output = hex ] ; then - format="-xF $input" -else - format="-F $input" -fi -shift -shift -shift -while [ $# -ge 1 ] ; do - l=`echo $1 | cut -c1` - if [ "$l" = "-" ] ; then - format="$format $1" - else - format="-T $1 $format" - fi - shift -done - -case $mode in -single) - echo "$name..."; - /bin/cp /dev/null results/$name - ( while read rule; do - set_core $name $n - echo "$rule" | ../ipftest -R $format -b -r regress/$name.ipf -N - -i input/$name >> \ - results/$name & - back=$! - wait $back - test_end_leak $? - n=`expr $n + 1` - echo "-------------------------------" >> results/$name - done ) < regress/$name.nat - check_results $name - ;; -multi) - echo "$name..."; - /bin/cp /dev/null results/$name - ../ipftest -R $format -b -r regress/$name.ipf -N regress/$name.nat \ - -i input/$name >> results/$name & - back=$! - wait $back - test_end_leak $? - echo "-------------------------------" >> results/$name - check_results $name - ;; -esac -exit $status diff --git a/contrib/ipfilter/test/nattest b/contrib/ipfilter/test/nattest deleted file mode 100755 index c970877..0000000 --- a/contrib/ipfilter/test/nattest +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -if [ $3 = hex ] ; then - format="-xF $2" -else - format="-F $2" -fi -if [ "$4" != "" ] ; then - case $4 in - -*) - format="$4 $format" - ;; - *) - format="-T $4 $format" - ;; - esac -fi - -echo "$name..."; -n=1 -/bin/cp /dev/null results/$name -( while read rule; do - set_core $name $n - echo "$rule" | ../ipftest $format -DRbN - -i input/$name >>results/$name & - back=$! - wait $back - test_end_leak $? - n=`expr $n + 1` - echo "-------------------------------" >> results/$name -done ) < regress/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/ptest b/contrib/ipfilter/test/ptest deleted file mode 100644 index 87daacc..0000000 --- a/contrib/ipfilter/test/ptest +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -/bin/cp /dev/null results/$name -if [ -f regress/$name.pool -a -f regress/$name.ipf ] ; then - ../ipftest -RD -b -P regress/$name.pool -r regress/$name.ipf -i input/$name >> \ - results/$name & -elif [ -f regress/$name.pool -a -f regress/$name.nat ] ; then - ../ipftest -RD -b -P regress/$name.pool -N regress/$name.nat -i input/$name >> \ - results/$name & -else - ../ipftest -RD -b -r regress/$name.ipf -i input/$name >> results/$name & -fi -back=$! -wait $back -test_end_leak $? -echo "-------------------------------" >> results/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/regress/bpf-f1 b/contrib/ipfilter/test/regress/bpf-f1 deleted file mode 100644 index 2c80283..0000000 --- a/contrib/ipfilter/test/regress/bpf-f1 +++ /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 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 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 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } diff --git a/contrib/ipfilter/test/regress/bpf1 b/contrib/ipfilter/test/regress/bpf1 deleted file mode 100644 index 5d83b77..0000000 --- a/contrib/ipfilter/test/regress/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 { "src host 1.1.1.1" } -pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "dst host 1.1.1.1" } diff --git a/contrib/ipfilter/test/regress/f1 b/contrib/ipfilter/test/regress/f1 deleted file mode 100644 index 6a2ede9..0000000 --- a/contrib/ipfilter/test/regress/f1 +++ /dev/null @@ -1,4 +0,0 @@ -block in all -pass in all -block out all -pass out all diff --git a/contrib/ipfilter/test/regress/f10 b/contrib/ipfilter/test/regress/f10 deleted file mode 100644 index 3552983..0000000 --- a/contrib/ipfilter/test/regress/f10 +++ /dev/null @@ -1,18 +0,0 @@ -block in from any to any with not ipopts -pass in from any to any with not opt sec-class topsecret -block in from any to any with not opt ssrr,sec-class topsecret -pass in from any to any with not opt ssrr,sec-class topsecret -block in from any to any with not opt ts,sec-class topsecret -pass in from any to any with not opt ts,sec-class topsecret -block in from any to any with not opt sec-class secret -pass in from any to any with not opt sec-class secret -block in from any to any with not opt lsrr,ssrr -pass in from any to any with not opt lsrr,ssrr -pass in from any to any with not ipopts -block in from any to any with not opt lsrr -pass in from any to any with not opt lsrr -block in from any to any with not opt ssrr,ts -pass in from any to any with not opt ssrr,ts -block in from any to any with not opt rr -pass in from any to any with not opt rr -block in from any to any with not opt sec-class topsecret diff --git a/contrib/ipfilter/test/regress/f11 b/contrib/ipfilter/test/regress/f11 deleted file mode 100644 index a71e528..0000000 --- a/contrib/ipfilter/test/regress/f11 +++ /dev/null @@ -1,7 +0,0 @@ -pass in proto tcp from any to any port = 23 flags S/SA keep state -block in proto tcp from any to any port = 23 flags S/SA keep state -pass in proto udp from any to any port = 53 keep frags -block in proto udp from any to any port = 53 keep frags -pass in proto udp from any to any port = 53 keep state -block in proto udp from any to any port = 53 keep state -pass in on e0 proto tcp from any to any port = 25 keep state diff --git a/contrib/ipfilter/test/regress/f12 b/contrib/ipfilter/test/regress/f12 deleted file mode 100644 index c29f839..0000000 --- a/contrib/ipfilter/test/regress/f12 +++ /dev/null @@ -1,6 +0,0 @@ -pass in proto tcp from any port > 1024 to any port = 25 with not short -pass in proto tcp from any port > 1024 to any port = 25 -block in proto tcp from any to any with short -block in proto tcp from any to any with frag -pass in proto udp from any port = 53 to any port = 53 -block in proto udp from any port = 53 to any port = 53 with not short diff --git a/contrib/ipfilter/test/regress/f13 b/contrib/ipfilter/test/regress/f13 deleted file mode 100644 index 393a65e..0000000 --- a/contrib/ipfilter/test/regress/f13 +++ /dev/null @@ -1,9 +0,0 @@ -pass in proto tcp from any to any port = 25 flags S/SA keep frags -block in proto tcp from any to any port = 25 flags S/SA keep frags -pass in proto udp from any to any port = 53 keep frags -block in proto udp from any to any port = 53 keep frags -pass in proto tcp from any to any port = 25 flags S/SA keep state keep frags -block in proto tcp from any to any port = 25 flags S/SA keep state keep frags -pass in proto udp from any to any port = 53 keep frags(strict) -pass in proto tcp from any to any port = 25 keep state(strict) -pass in proto tcp from any to any port = 25 keep state(loose) diff --git a/contrib/ipfilter/test/regress/f14 b/contrib/ipfilter/test/regress/f14 deleted file mode 100644 index 06ab519..0000000 --- a/contrib/ipfilter/test/regress/f14 +++ /dev/null @@ -1,8 +0,0 @@ -block in from !1.1.1.1 to any -pass in from 1.1.1.1 to !any -block in from 1.1.1.0/24 to !any -pass in from !1.1.1.0/24 to any -block in from !1.1.0.0/16 to any -pass in from 1.1.0.0/16 to !1.2.0.0/16 -block in from any to !127.0.0.0/8 -pass in from !any to any diff --git a/contrib/ipfilter/test/regress/f15 b/contrib/ipfilter/test/regress/f15 deleted file mode 100644 index 16185e1..0000000 --- a/contrib/ipfilter/test/regress/f15 +++ /dev/null @@ -1,8 +0,0 @@ -block in log quick on hme0 from any to 195.134.65.0/25 head 10 -block return-rst in log quick proto tcp all flags S head 100 group 10 -pass in quick proto tcp from any to any port = 22 keep state group 100 -pass in quick proto tcp from any to any port = 23 keep state group 100 -pass in quick proto tcp from any to any port = 21 keep state group 100 -block return-icmp in quick proto udp all keep state head 110 group 10 -pass in quick proto udp from any to any port = 53 keep state group 110 -block in log quick on hme0 from any to any diff --git a/contrib/ipfilter/test/regress/f16 b/contrib/ipfilter/test/regress/f16 deleted file mode 100644 index 920ad8c..0000000 --- a/contrib/ipfilter/test/regress/f16 +++ /dev/null @@ -1,10 +0,0 @@ -pass in all -skip 2 in proto tcp all -block in quick proto tcp all -skip 4 in proto udp all -block in quick proto udp all -pass in quick proto tcp from any to 1.1.1.1 -pass in quick proto tcp from any to 1.1.1.2 port = 22 -block in quick proto udp from any to any port = 53 -pass in quick proto udp from any to any port = 53 -block in all diff --git a/contrib/ipfilter/test/regress/f17 b/contrib/ipfilter/test/regress/f17 deleted file mode 100644 index 9a75ae3..0000000 --- a/contrib/ipfilter/test/regress/f17 +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass out quick on ppp0 proto tcp all flags S keep state -block return-rst in quick proto tcp all diff --git a/contrib/ipfilter/test/regress/f18 b/contrib/ipfilter/test/regress/f18 deleted file mode 100644 index acba2b3..0000000 --- a/contrib/ipfilter/test/regress/f18 +++ /dev/null @@ -1,4 +0,0 @@ -pass in from 1.1.1.1 to any -pass out from 2.2.2.2 to any -count in from 1.1.1.1 to 3.3.3.3 -count out from 2.2.2.2 to 4.4.4.4 diff --git a/contrib/ipfilter/test/regress/f19 b/contrib/ipfilter/test/regress/f19 deleted file mode 100644 index d7770b8..0000000 --- a/contrib/ipfilter/test/regress/f19 +++ /dev/null @@ -1,2 +0,0 @@ -pass in quick proto tcp all flags S keep state -pass in quick proto tcp all flags S keep state(limit 1) diff --git a/contrib/ipfilter/test/regress/f2 b/contrib/ipfilter/test/regress/f2 deleted file mode 100644 index e2f02a4..0000000 --- a/contrib/ipfilter/test/regress/f2 +++ /dev/null @@ -1,6 +0,0 @@ -block in proto tcp from any to any -pass in proto tcp from any to any -block in proto udp from any to any -pass in proto udp from any to any -block in proto icmp from any to any -pass in proto icmp from any to any diff --git a/contrib/ipfilter/test/regress/f20 b/contrib/ipfilter/test/regress/f20 deleted file mode 100644 index 279523e..0000000 --- a/contrib/ipfilter/test/regress/f20 +++ /dev/null @@ -1,4 +0,0 @@ -block out quick on de0 head 100 -skip 1 out group 100 -block out quick group 100 -pass out quick group 100 diff --git a/contrib/ipfilter/test/regress/f21 b/contrib/ipfilter/test/regress/f21 deleted file mode 100644 index 26ffa87..0000000 --- a/contrib/ipfilter/test/regress/f21 +++ /dev/null @@ -1,2 +0,0 @@ -pass out proto tcp all flags S keep state(icmp-head icmpredir) -block in proto icmp all icmp-type redir group icmpredir diff --git a/contrib/ipfilter/test/regress/f22 b/contrib/ipfilter/test/regress/f22 deleted file mode 100644 index 10765db..0000000 --- a/contrib/ipfilter/test/regress/f22 +++ /dev/null @@ -1,2 +0,0 @@ -pass in proto tcp all flags S keep state(icmp-head icmpredir) -block out proto icmp all icmp-type redir group icmpredir diff --git a/contrib/ipfilter/test/regress/f24 b/contrib/ipfilter/test/regress/f24 deleted file mode 100644 index 5cb3bab..0000000 --- a/contrib/ipfilter/test/regress/f24 +++ /dev/null @@ -1 +0,0 @@ -pass out quick proto udp all keep state keep frags diff --git a/contrib/ipfilter/test/regress/f25 b/contrib/ipfilter/test/regress/f25 deleted file mode 100644 index c018b49..0000000 --- a/contrib/ipfilter/test/regress/f25 +++ /dev/null @@ -1 +0,0 @@ -pass in on hme0 proto udp all with mcast keep state diff --git a/contrib/ipfilter/test/regress/f26 b/contrib/ipfilter/test/regress/f26 deleted file mode 100644 index 22357a4..0000000 --- a/contrib/ipfilter/test/regress/f26 +++ /dev/null @@ -1,6 +0,0 @@ -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3) -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/32) -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/16) -pass in quick proto tcp all flags S keep state(max-srcs 3) -pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/32) -pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/16) diff --git a/contrib/ipfilter/test/regress/f27 b/contrib/ipfilter/test/regress/f27 deleted file mode 100644 index 22357a4..0000000 --- a/contrib/ipfilter/test/regress/f27 +++ /dev/null @@ -1,6 +0,0 @@ -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3) -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/32) -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/16) -pass in quick proto tcp all flags S keep state(max-srcs 3) -pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/32) -pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/16) diff --git a/contrib/ipfilter/test/regress/f28.ipf b/contrib/ipfilter/test/regress/f28.ipf deleted file mode 100644 index ca42771..0000000 --- a/contrib/ipfilter/test/regress/f28.ipf +++ /dev/null @@ -1,2 +0,0 @@ -block in all -pass in on nic0 to dstlist/spread from 4.4.0.0/16 to any diff --git a/contrib/ipfilter/test/regress/f28.pool b/contrib/ipfilter/test/regress/f28.pool deleted file mode 100644 index 499b603..0000000 --- a/contrib/ipfilter/test/regress/f28.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool ipf/dstlist (name spread; policy round-robin;) - { nic0:1.1.0.2; nic1:1.1.1.2; nic2:1.1.2.2; nic3:1.1.3.2; }; diff --git a/contrib/ipfilter/test/regress/f29.ipf b/contrib/ipfilter/test/regress/f29.ipf deleted file mode 100644 index e4634cc..0000000 --- a/contrib/ipfilter/test/regress/f29.ipf +++ /dev/null @@ -1,2 +0,0 @@ -block in all -pass in on nic0 to dstlist/spread from 4.4.0.0/16 to any keep state diff --git a/contrib/ipfilter/test/regress/f29.pool b/contrib/ipfilter/test/regress/f29.pool deleted file mode 100644 index 499b603..0000000 --- a/contrib/ipfilter/test/regress/f29.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool ipf/dstlist (name spread; policy round-robin;) - { nic0:1.1.0.2; nic1:1.1.1.2; nic2:1.1.2.2; nic3:1.1.3.2; }; diff --git a/contrib/ipfilter/test/regress/f3 b/contrib/ipfilter/test/regress/f3 deleted file mode 100644 index ee80729..0000000 --- a/contrib/ipfilter/test/regress/f3 +++ /dev/null @@ -1,8 +0,0 @@ -block in from 1.1.1.1 to any -pass in from 1.1.1.1 to any -block in from 1.1.1.1/24 to any -pass in from 1.1.1.1/24 to any -block in from 1.1.1.1/16 to any -pass in from 1.1.1.1/16 to any -block in from 1.1.1.1/0 to any -pass in from 1.1.1.1/0 to any diff --git a/contrib/ipfilter/test/regress/f30 b/contrib/ipfilter/test/regress/f30 deleted file mode 100644 index 84a8970..0000000 --- a/contrib/ipfilter/test/regress/f30 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on hme0 proto udp all with not ipopts keep state -pass in on hme0 proto udp all with ipopts keep state -pass in on hme0 proto tcp all flags S with opt rr keep state -pass in on hme0 proto tcp all flags S with opt sec-class secret keep state diff --git a/contrib/ipfilter/test/regress/f4 b/contrib/ipfilter/test/regress/f4 deleted file mode 100644 index bc8af2f..0000000 --- a/contrib/ipfilter/test/regress/f4 +++ /dev/null @@ -1,8 +0,0 @@ -block in from any to 1.1.1.1 -pass in from any to 1.1.1.1 -block in from any to 1.1.1.1/24 -pass in from any to 1.1.1.1/24 -block in from any to 1.1.1.1/16 -pass in from any to 1.1.1.1/16 -block in from any to 1.1.1.1/0 -pass in from any to 1.1.1.1/0 diff --git a/contrib/ipfilter/test/regress/f5 b/contrib/ipfilter/test/regress/f5 deleted file mode 100644 index 998eabd..0000000 --- a/contrib/ipfilter/test/regress/f5 +++ /dev/null @@ -1,48 +0,0 @@ -block in proto tcp from any port = 23 to any -block in proto udp from any port = 23 to any -block in proto tcp/udp from any port = 23 to any -pass in proto tcp from any port <= 1023 to any -pass in proto udp from any port <= 1023 to any -pass in proto tcp/udp from any port <= 1023 to any -block in proto tcp from any port >= 1024 to any -block in proto udp from any port >= 1024 to any -block in proto tcp/udp from any port >= 1024 to any -pass in proto tcp from any port >= 1024 to any -pass in proto udp from any port >= 1024 to any -pass in proto tcp/udp from any port >= 1024 to any -block in proto tcp from any port 0 >< 512 to any -block in proto udp from any port 0 >< 512 to any -block in proto tcp/udp from any port 0 >< 512 to any -pass in proto tcp from any port 0 >< 512 to any -pass in proto udp from any port 0 >< 512 to any -pass in proto tcp/udp from any port 0 >< 512 to any -block in proto tcp from any port 6000 <> 6009 to any -block in proto udp from any port 6000 <> 6009 to any -block in proto tcp/udp from any port 6000 <> 6009 to any -pass in proto tcp from any port 6000 <> 6009 to any -pass in proto udp from any port 6000 <> 6009 to any -pass in proto tcp/udp from any port 6000 <> 6009 to any -pass in proto tcp from any port = 23 to any -pass in proto udp from any port = 23 to any -pass in proto tcp/udp from any port = 23 to any -block in proto tcp from any port != 21 to any -block in proto udp from any port != 21 to any -block in proto tcp/udp from any port != 21 to any -pass in proto tcp from any port != 21 to any -pass in proto udp from any port != 21 to any -pass in proto tcp/udp from any port != 21 to any -block in proto tcp from any port < 1024 to any -block in proto udp from any port < 1024 to any -block in proto tcp/udp from any port < 1024 to any -pass in proto tcp from any port < 1024 to any -pass in proto udp from any port < 1024 to any -pass in proto tcp/udp from any port < 1024 to any -block in proto tcp from any port > 1023 to any -block in proto udp from any port > 1023 to any -block in proto tcp/udp from any port > 1023 to any -pass in proto tcp from any port > 1023 to any -pass in proto udp from any port > 1023 to any -pass in proto tcp/udp from any port > 1023 to any -block in proto tcp from any port <= 1023 to any -block in proto udp from any port <= 1023 to any -block in proto tcp/udp from any port <= 1023 to any diff --git a/contrib/ipfilter/test/regress/f6 b/contrib/ipfilter/test/regress/f6 deleted file mode 100644 index 291f09ad..0000000 --- a/contrib/ipfilter/test/regress/f6 +++ /dev/null @@ -1,48 +0,0 @@ -block in proto tcp from any to any port = 23 -block in proto udp from any to any port = 23 -block in proto tcp/udp from any to any port = 23 -pass in proto tcp from any to any port <= 1023 -pass in proto udp from any to any port <= 1023 -pass in proto tcp/udp from any to any port <= 1023 -block in proto tcp from any to any port >= 1024 -block in proto udp from any to any port >= 1024 -block in proto tcp/udp from any to any port >= 1024 -pass in proto tcp from any to any port >= 1024 -pass in proto udp from any to any port >= 1024 -pass in proto tcp/udp from any to any port >= 1024 -block in proto tcp from any to any port 0 >< 512 -block in proto udp from any to any port 0 >< 512 -block in proto tcp/udp from any to any port 0 >< 512 -pass in proto tcp from any to any port 0 >< 512 -pass in proto udp from any to any port 0 >< 512 -pass in proto tcp/udp from any to any port 0 >< 512 -block in proto tcp from any to any port 6000 <> 6009 -block in proto udp from any to any port 6000 <> 6009 -block in proto tcp/udp from any to any port 6000 <> 6009 -pass in proto tcp from any to any port 6000 <> 6009 -pass in proto udp from any to any port 6000 <> 6009 -pass in proto tcp/udp from any to any port 6000 <> 6009 -pass in proto tcp from any to any port = 23 -pass in proto udp from any to any port = 23 -pass in proto tcp/udp from any to any port = 23 -block in proto tcp from any to any port != 21 -block in proto udp from any to any port != 21 -block in proto tcp/udp from any to any port != 21 -pass in proto tcp from any to any port != 21 -pass in proto udp from any to any port != 21 -pass in proto tcp/udp from any to any port != 21 -block in proto tcp from any to any port < 1024 -block in proto udp from any to any port < 1024 -block in proto tcp/udp from any to any port < 1024 -pass in proto tcp from any to any port < 1024 -pass in proto udp from any to any port < 1024 -pass in proto tcp/udp from any to any port < 1024 -block in proto tcp from any to any port > 1023 -block in proto udp from any to any port > 1023 -block in proto tcp/udp from any to any port > 1023 -pass in proto tcp from any to any port > 1023 -pass in proto udp from any to any port > 1023 -pass in proto tcp/udp from any to any port > 1023 -block in proto tcp from any to any port <= 1023 -block in proto udp from any to any port <= 1023 -block in proto tcp/udp from any to any port <= 1023 diff --git a/contrib/ipfilter/test/regress/f7 b/contrib/ipfilter/test/regress/f7 deleted file mode 100644 index be1b969..0000000 --- a/contrib/ipfilter/test/regress/f7 +++ /dev/null @@ -1,9 +0,0 @@ -block in proto icmp from any to any icmp-type echo -pass in proto icmp from any to any icmp-type echo -block in proto icmp from any to any icmp-type unreach code 3 -pass in proto icmp from any to any icmp-type unreach code 3 -block in proto icmp from any to any icmp-type echorep -pass in proto icmp from any to any icmp-type echorep -pass in proto icmp all icmp-type maskreq keep state -pass in proto icmp all icmp-type timest keep state -pass in proto icmp all icmp-type inforeq keep state diff --git a/contrib/ipfilter/test/regress/f8 b/contrib/ipfilter/test/regress/f8 deleted file mode 100644 index 0f28fd2..0000000 --- a/contrib/ipfilter/test/regress/f8 +++ /dev/null @@ -1,6 +0,0 @@ -block in proto tcp from any to any flags S -pass in proto tcp from any to any flags S -block in proto tcp from any to any flags S/SA -pass in proto tcp from any to any flags S/SA -block in proto tcp from any to any flags S/APU -pass in proto tcp from any to any flags S/APU diff --git a/contrib/ipfilter/test/regress/f9 b/contrib/ipfilter/test/regress/f9 deleted file mode 100644 index 17bc967..0000000 --- a/contrib/ipfilter/test/regress/f9 +++ /dev/null @@ -1,18 +0,0 @@ -block in from any to any with ipopts -pass in from any to any with opt sec-class topsecret -block in from any to any with opt ssrr,sec-class topsecret -pass in from any to any with opt ssrr,sec-class topsecret -block in from any to any with opt ts,sec-class topsecret -pass in from any to any with opt ts,sec-class topsecret -block in from any to any with opt sec-class secret -pass in from any to any with opt sec-class secret -block in from any to any with opt lsrr,ssrr -pass in from any to any with opt lsrr,ssrr -pass in from any to any with ipopts -block in from any to any with opt lsrr -pass in from any to any with opt lsrr -block in from any to any with opt ssrr,ts -pass in from any to any with opt ssrr,ts -block in from any to any with opt rr -pass in from any to any with opt rr -block in from any to any with opt sec-class topsecret diff --git a/contrib/ipfilter/test/regress/i1 b/contrib/ipfilter/test/regress/i1 deleted file mode 100644 index 0fd2c6e..0000000 --- a/contrib/ipfilter/test/regress/i1 +++ /dev/null @@ -1,18 +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 from localhost to localhost -pass in on ed0,vx0 from localhost to localhost -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(1) 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 from test.host.dots to test\.host.dots diff --git a/contrib/ipfilter/test/regress/i10 b/contrib/ipfilter/test/regress/i10 deleted file mode 100644 index 640ac84..0000000 --- a/contrib/ipfilter/test/regress/i10 +++ /dev/null @@ -1,5 +0,0 @@ -pass in from localhost to localhost with opt sec -pass in from localhost to localhost with opt lsrr not opt sec -block in from any to any with not opt sec-class topsecret -block in from any to any with not opt sec-class topsecret,secret -pass in from any to any with opt sec-class topsecret,confid not opt sec-class unclass diff --git a/contrib/ipfilter/test/regress/i11 b/contrib/ipfilter/test/regress/i11 deleted file mode 100644 index ca65da3..0000000 --- a/contrib/ipfilter/test/regress/i11 +++ /dev/null @@ -1,12 +0,0 @@ -pass in on ed0 proto tcp from localhost to localhost port = telnet keep state -block in log first on lo0 proto tcp/udp from any to any port = echo keep state -pass in proto udp from localhost to localhost port = 20499 keep frag -pass in proto udp from localhost to localhost port = 2049 keep frag(strict) -pass in proto udp from localhost to localhost port = 53 keep state keep frags -pass in on ed0 out-via vx0 proto udp from any to any keep state -pass out on ppp0 in-via le0 proto tcp from any to any keep state -pass in on ed0,vx0 out-via vx0,ed0 proto udp from any to any keep state -pass in proto tcp from any port gt 1024 to localhost port eq 1024 keep state -pass in proto tcp all flags S keep state(strict,newisn,no-icmp-err,limit 101,age 600) -pass in proto tcp all flags S keep state(loose,newisn,no-icmp-err,limit 101,age 600) -pass in proto udp all keep state(age 10/20,sync) diff --git a/contrib/ipfilter/test/regress/i12 b/contrib/ipfilter/test/regress/i12 deleted file mode 100644 index f42c2d5..0000000 --- a/contrib/ipfilter/test/regress/i12 +++ /dev/null @@ -1,10 +0,0 @@ -pass in from 1.1.1.1/32 to 2.2.2.2/32 -pass in from {2.2.2.2/24,3.3.3.3/32} to 4.4.4.4/32 -pass in from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32} -pass in from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32} port = {22,25} -pass in proto tcp from {2.2.2.2/24,3.3.3.3/32} port = {53,9} to {5.5.5.5/32,6.6.6.6/32} -pass in proto udp from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32} port = {53,9} -pass in from 10.10.10.10 to 11.11.11.11 -pass in from pool/101 to hash/202 -pass in from hash/303 to pool/404 -pass in from pool=(!1.1.1.1,2.2.2.2,!2.2.0.0/16) to pool = ( 1.1.0.0/16 ) diff --git a/contrib/ipfilter/test/regress/i13 b/contrib/ipfilter/test/regress/i13 deleted file mode 100644 index 3ba343d..0000000 --- a/contrib/ipfilter/test/regress/i13 +++ /dev/null @@ -1,8 +0,0 @@ -a=any; -b="from $a"; -c='to $a'; -d=block; -e="pass in"; -$d in $b $c -f=" $b $c"; -$e${f} diff --git a/contrib/ipfilter/test/regress/i14 b/contrib/ipfilter/test/regress/i14 deleted file mode 100644 index 54613a5..0000000 --- a/contrib/ipfilter/test/regress/i14 +++ /dev/null @@ -1,12 +0,0 @@ -block in on eri0 all head 1 -pass in on eri0 proto icmp all group 1 -pass out on ed0 all head 1000000 -block out on ed0 proto udp all group 1000000 -block in on vm0 proto tcp/udp all head 101 -pass in from 1.1.1.1 to 2.2.2.2 group 101 -pass in proto tcp from 1.0.0.1 to 2.0.0.2 group 101 -pass in proto udp from 2.0.0.2 to 3.0.0.3 group 101 -block in on vm0 proto tcp/udp all head vm0-group -pass in from 1.1.1.1 to 2.2.2.2 group vm0-group -block in on vm0 proto tcp/udp all head vm0-group -pass in from 1.1.1.1 to 2.2.2.2 group vm0-group diff --git a/contrib/ipfilter/test/regress/i15 b/contrib/ipfilter/test/regress/i15 deleted file mode 100644 index 0e6b0d1..0000000 --- a/contrib/ipfilter/test/regress/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=overtherainbowisapotof) diff --git a/contrib/ipfilter/test/regress/i16 b/contrib/ipfilter/test/regress/i16 deleted file mode 100644 index 5c9144a..0000000 --- a/contrib/ipfilter/test/regress/i16 +++ /dev/null @@ -1,3 +0,0 @@ -0 block out all -100 pass in all -10101 pass out proto tcp all diff --git a/contrib/ipfilter/test/regress/i17 b/contrib/ipfilter/test/regress/i17 deleted file mode 100644 index 139b86a..0000000 --- a/contrib/ipfilter/test/regress/i17 +++ /dev/null @@ -1,13 +0,0 @@ -100 pass in all -200 pass in proto tcp all -110 pass in proto udp all -110 pass in from localhost to any -pass in all -pass in from localhost to any -@0 100 pass in from localhost to any -@1 pass in from any to localhost -@0 pass in from 1.1.1.1 to any -@1 110 pass in from 2.2.2.2 to any -@2 pass in from 3.3.3.3 to any -call srcgrpmap/100 out from 10.1.0.0/16 to any -call now dstgrpmap/200 in from 10.2.0.0/16 to any diff --git a/contrib/ipfilter/test/regress/i18 b/contrib/ipfilter/test/regress/i18 deleted file mode 100644 index b55b11a..0000000 --- a/contrib/ipfilter/test/regress/i18 +++ /dev/null @@ -1,3 +0,0 @@ -pass in tos {80,0x80} all -pass out tos {0x80,80} all -block in ttl {0,1,2,3,4,5,6} all diff --git a/contrib/ipfilter/test/regress/i19 b/contrib/ipfilter/test/regress/i19 deleted file mode 100644 index a09fd56..0000000 --- a/contrib/ipfilter/test/regress/i19 +++ /dev/null @@ -1,22 +0,0 @@ -block in quick log level user.debug proto icmp all -block in quick log level mail.info proto icmp all -block in quick log level daemon.notice proto icmp all -block in quick log level auth.warn proto icmp all -block in quick log level syslog.err proto icmp all -block in quick log level lpr.crit proto icmp all -block in quick log level news.alert proto icmp all -block in quick log level uucp.emerg proto icmp all -block in quick log level cron.debug proto icmp all -block in quick log level ftp.info proto icmp all -block in quick log level authpriv.notice proto icmp all -block in quick log level logalert.warn proto icmp all -block in quick log level local0.err proto icmp all -block in quick log level local1.crit proto icmp all -block in quick log level local2.alert proto icmp all -block in quick log level local3.emerg proto icmp all -block in quick log level local4.debug proto icmp all -block in quick log level local5.info proto icmp all -block in quick log level local6.notice proto icmp all -block in quick log level local7.warn proto icmp all -block in quick log level kern.err proto icmp all -block in quick log level security.emerg proto icmp all diff --git a/contrib/ipfilter/test/regress/i2 b/contrib/ipfilter/test/regress/i2 deleted file mode 100644 index f69e28e..0000000 --- a/contrib/ipfilter/test/regress/i2 +++ /dev/null @@ -1,9 +0,0 @@ -log in proto tcp all -pass in proto 6 from any to any -pass in proto udp from localhost to localhost -block in proto ipv6 from any to any -block in proto 17 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/regress/i20 b/contrib/ipfilter/test/regress/i20 deleted file mode 100644 index 99039ee..0000000 --- a/contrib/ipfilter/test/regress/i20 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on ppp0 from ppp0/peer to ppp0/32 -block in on hme0 from any to hme0/broadcast -pass in on bge0 from bge0/network to bge0/32 -block in on eri0 from any to eri0/netmasked diff --git a/contrib/ipfilter/test/regress/i21 b/contrib/ipfilter/test/regress/i21 deleted file mode 100644 index 237f8fa..0000000 --- a/contrib/ipfilter/test/regress/i21 +++ /dev/null @@ -1,7 +0,0 @@ -pass in from port = 10101 -pass out from any to port != 22 -block in from port 20:21 -block out from any to port 10 <> 100 -pass out from any to port = {3,5,7,9} -block in from port = {20,25} -pass in from any port = {11:12, 21:22} to any port = {1:2, 4:5, 8:9} diff --git a/contrib/ipfilter/test/regress/i22 b/contrib/ipfilter/test/regress/i22 deleted file mode 100644 index 1ac8d12..0000000 --- a/contrib/ipfilter/test/regress/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,5.6.7.8;" } -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/regress/i23 b/contrib/ipfilter/test/regress/i23 deleted file mode 100644 index 792d600..0000000 --- a/contrib/ipfilter/test/regress/i23 +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/contrib/ipfilter/test/regress/i3 b/contrib/ipfilter/test/regress/i3 deleted file mode 100644 index 390fc3c..0000000 --- a/contrib/ipfilter/test/regress/i3 +++ /dev/null @@ -1,14 +0,0 @@ -log in all -pass in from 128.16/16 to 129.10.10/24 -pass in from 128.0.0.1/24 to 1\ -28\ -.\ -0.0.1/16 -pass in from 128.0.0.1/0xffffff00 to 128.0.0.1/0xffff0000 -pass in from 128.0.0.1/255.255.255.0 to 128.0.0.1/255.255.0.0 -pass in from 128.0.0.1 mask 0xffffff00 to 128.0.0.1 mask 0xffff0000 -pass in from 128.0.0.1 mask 255.255.255.0 to 128.0.0.1 mask 255.255.0.0 -pass in from localhost to localhost -block in log from 0/0 to 0/0 -block in log level auth.info on hme0 all -log level local5.warn out all diff --git a/contrib/ipfilter/test/regress/i4 b/contrib/ipfilter/test/regress/i4 deleted file mode 100644 index 8551f76..0000000 --- a/contrib/ipfilter/test/regress/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 6 from any port != 0 to any port 0 >< 65535 -pass in proto 17 from localhost port > 32000 to localhost port < 29000 -block in proto udp from any port != \ntp to any port < echo -block in proto tcp from any port = smtp 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 keep state diff --git a/contrib/ipfilter/test/regress/i5 b/contrib/ipfilter/test/regress/i5 deleted file mode 100644 index 788f971..0000000 --- a/contrib/ipfilter/test/regress/i5 +++ /dev/null @@ -1,9 +0,0 @@ -log in all -count in tos 0x80 from any to any -pass in on ed0 tos 64 from localhost to localhost -block in log on lo0 ttl 0 from any to any -pass in quick ttl 1 from any to any -skip 3 out from 127.0.0.1 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/regress/i6 b/contrib/ipfilter/test/regress/i6 deleted file mode 100644 index 0b371bd..0000000 --- a/contrib/ipfilter/test/regress/i6 +++ /dev/null @@ -1,12 +0,0 @@ -pass in on lo0 fastroute from any to any -pass in on lo0 to qe0 from localhost to localhost -pass in on le0 to qe0:127.0.0.1 from localhost to localhost -pass in on lo0 dup-to qe0 from localhost to localhost -pass in on le0 dup-to qe0:127.0.0.1 from localhost to localhost -pass in on le0 to hme0:10.1.1.1 dup-to qe0:127.0.0.1 from localhost to localhost -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 all -pass in quick fastroute all diff --git a/contrib/ipfilter/test/regress/i7 b/contrib/ipfilter/test/regress/i7 deleted file mode 100644 index 15b88a5..0000000 --- a/contrib/ipfilter/test/regress/i7 +++ /dev/null @@ -1,14 +0,0 @@ -pass in on ed0 proto tcp from localhost to localhost port = 23 flags S/SA -block in on lo0 proto tcp from any to any flags A -pass in on lo0 proto tcp from any to any flags /SAP -block in on lo0 proto tcp from any to any flags 0x80/A -pass in on lo0 proto tcp from any to any flags S/18 -block in on lo0 proto tcp from any to any flags 2/18 -pass in on lo0 proto tcp from any to any flags 2 -block in on lo0 proto tcp from any to any flags /16 -pass in on lo0 proto tcp from any to any flags 2/SA -pass in on lo0 proto tcp from any to any flags S/18 -block in on lo0 proto tcp from any to any flags 2/18 -pass in on lo0 proto tcp from any to any flags 2 -block in on lo0 proto tcp from any to any flags /16 -pass in on lo0 proto tcp from any to any flags 2/SA diff --git a/contrib/ipfilter/test/regress/i8 b/contrib/ipfilter/test/regress/i8 deleted file mode 100644 index abf69d9..0000000 --- a/contrib/ipfilter/test/regress/i8 +++ /dev/null @@ -1,62 +0,0 @@ -pass in proto icmp from localhost to localhost icmp-type timest -block in proto icmp from any to any icmp-type unreach code 1 -pass in proto icmp all icmp-type unreach code cutoff-preced -pass in proto icmp all icmp-type unreach code filter-prohib -pass in proto icmp all icmp-type unreach code isolate -pass in proto icmp all icmp-type unreach code needfrag -pass in proto icmp all icmp-type unreach code net-prohib -pass in proto icmp all icmp-type unreach code net-tos -pass in proto icmp all icmp-type unreach code host-preced -pass in proto icmp all icmp-type unreach code host-prohib -pass in proto icmp all icmp-type unreach code host-tos -pass in proto icmp all icmp-type unreach code host-unk -pass in proto icmp all icmp-type unreach code host-unr -pass in proto icmp all icmp-type unreach code {net-unk,net-unr} -pass in proto icmp all icmp-type unreach code port-unr -pass in proto icmp all icmp-type unreach code proto-unr -pass in proto icmp all icmp-type unreach code srcfail -pass in proto icmp all icmp-type {echo,echorep} -pass in proto icmp all icmp-type inforeq -pass in proto icmp all icmp-type inforep -pass in proto icmp all icmp-type maskrep -pass in proto icmp all icmp-type maskreq -pass in proto icmp all icmp-type paramprob -pass in proto icmp all icmp-type redir -pass in proto icmp all icmp-type unreach -pass in proto icmp all icmp-type routerad -pass in proto icmp all icmp-type routersol -pass in proto icmp all icmp-type squench -pass in proto icmp all icmp-type timest -pass in proto icmp all icmp-type timestrep -pass in proto icmp all icmp-type timex -pass in proto icmp all icmp-type 254 -pass in proto icmp all icmp-type 253 code 254 -pass in proto icmp all icmp-type unreach code cutoff-preced -pass in proto icmp all icmp-type unreach code filter-prohib -pass in proto icmp all icmp-type unreach code isolate -pass in proto icmp all icmp-type unreach code needfrag -pass in proto icmp all icmp-type unreach code net-prohib -pass in proto icmp all icmp-type unreach code net-tos -pass in proto icmp all icmp-type unreach code host-preced -pass in proto icmp all icmp-type unreach code host-prohib -pass in proto icmp all icmp-type unreach code host-tos -pass in proto icmp all icmp-type unreach code host-unk -pass in proto icmp all icmp-type unreach code host-unr -pass in proto icmp all icmp-type unreach code {net-unk,net-unr} -pass in proto icmp all icmp-type unreach code port-unr -pass in proto icmp all icmp-type unreach code proto-unr -pass in proto icmp all icmp-type unreach code srcfail -pass in proto icmp all icmp-type {echo,echorep} -pass in proto icmp all icmp-type inforeq -pass in proto icmp all icmp-type inforep -pass in proto icmp all icmp-type maskrep -pass in proto icmp all icmp-type maskreq -pass in proto icmp all icmp-type paramprob -pass in proto icmp all icmp-type redir -pass in proto icmp all icmp-type unreach -pass in proto icmp all icmp-type routerad -pass in proto icmp all icmp-type routersol -pass in proto icmp all icmp-type squench -pass in proto icmp all icmp-type timest -pass in proto icmp all icmp-type timestrep -pass in proto icmp all icmp-type timex diff --git a/contrib/ipfilter/test/regress/i9 b/contrib/ipfilter/test/regress/i9 deleted file mode 100644 index 441cfa9..0000000 --- a/contrib/ipfilter/test/regress/i9 +++ /dev/null @@ -1,17 +0,0 @@ -pass in from localhost to localhost with short,frags -block in from any to any with ipopts -pass in from any to any with opt nop,rr,zsu -pass in from any to any with opt nop,rr,zsu not opt ssrr,lsrr -pass in from localhost to localhost and not frag -pass in from localhost to localhost with frags,frag-body -pass in proto tcp all flags S with not oow keep state -block in proto tcp all with oow -pass in proto tcp all flags S with not bad,bad-src,bad-nat -block in proto tcp all flags S with bad,not bad-src,not bad-nat -pass in quick all with not short -block in quick all with not nat -pass in quick all with not frag-body -block in quick all with not lowttl -pass in all with mbcast,not bcast,multicast,not state,not ipopts -block in all with not mbcast,bcast,not multicast,state -pass in from any to any with opt mtur,mtup,encode,ts,tr,sec,cipso,satid,ssrr,visa,imitd,eip,finn,dps,sdb,nsapa,rtralrt,ump,addext,e-sec diff --git a/contrib/ipfilter/test/regress/in1 b/contrib/ipfilter/test/regress/in1 deleted file mode 100644 index d5d0cf4..0000000 --- a/contrib/ipfilter/test/regress/in1 +++ /dev/null @@ -1,31 +0,0 @@ -map le0 0/0 -> 0/32 -map le0 1/32 -> 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.5/8 -> 1.2.3.4/24 -map le0 10.0.0.5/0xff000000 -> 1.2.3.4/24 -map le0 10.0.0.5/0xff -> 1.2.3.4/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 tcpudp auto -map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/6 -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 ftp ftp/tcp frag -map le0 0/0 -> 0/32 age 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 -map le0 0/0 -> 0/32 frag age 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 -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 any port = 123 -> 0/32 age 30/1 udp diff --git a/contrib/ipfilter/test/regress/in100 b/contrib/ipfilter/test/regress/in100 deleted file mode 100644 index 5e2ab6c..0000000 --- a/contrib/ipfilter/test/regress/in100 +++ /dev/null @@ -1,3 +0,0 @@ -rewrite in on bge0 from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4; -rewrite out on bge0 from 1.1.1.1/32 to 2.2.2.2 -> src 3.3.3.0/24 dst 4.4.4.4; -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/regress/in101 b/contrib/ipfilter/test/regress/in101 deleted file mode 100644 index afef53b..0000000 --- a/contrib/ipfilter/test/regress/in101 +++ /dev/null @@ -1,4 +0,0 @@ -rewrite in on bge0 proto icmp from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4; -rewrite in on bge0 proto udp from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4; -rewrite out on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2 -> src 3.3.3.0/24 dst 4.4.4.4; -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/regress/in102 b/contrib/ipfilter/test/regress/in102 deleted file mode 100644 index 57f3645..0000000 --- a/contrib/ipfilter/test/regress/in102 +++ /dev/null @@ -1,5 +0,0 @@ -rewrite in on bge0 proto tcp from any to any -> src 0/0 dst dstlist/a; -rewrite in on bge0 proto tcp from 1.1.1.1 to any -> src 0/0 dst dstlist/bee; -rewrite in on bge0 proto tcp from 1.1.1.1 to 2.2.2.2 -> src 0/0 dst dstlist/cat; -rewrite in on bge0 proto tcp from pool/a to 2.2.2.2 -> 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/regress/in2 b/contrib/ipfilter/test/regress/in2 deleted file mode 100644 index 58556c0..0000000 --- a/contrib/ipfilter/test/regress/in2 +++ /dev/null @@ -1,71 +0,0 @@ -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 tcp -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 255 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1 ip -rdr le0 9.8.7.6/0xff000000 -> 1.1.1.1 ip -rdr le0 9.8.7.6/0xffff0000 -> 1.1.1.1 ip -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 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 port 80 udp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp/udp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 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 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 port 0 -> 1.1.1.1 port 0 ip frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcpudp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 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 ip frag age 10 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 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 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky -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 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 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 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 sticky -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky 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 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 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky 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 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 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 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp 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 frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 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 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 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 frag age 20 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 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 sticky mssclamp 1000 tag nattagcacheline -rdr ge0 9.8.7.6/32 -> 1.1.1.1 proxy port 21 ftp/tcp -rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1 port 21 tcp proxy ftp -rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port 5555 tcp -rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port = 5555 tcp -rdr le0 0/0 -> test.host.dots -rdr le0 any -> test.host.dots,test.host.dots -rdr adsl0,ppp0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port 5555-7777 tcp diff --git a/contrib/ipfilter/test/regress/in3 b/contrib/ipfilter/test/regress/in3 deleted file mode 100644 index d8016b6..0000000 --- a/contrib/ipfilter/test/regress/in3 +++ /dev/null @@ -1,5 +0,0 @@ -bimap le0 0/0 -> 0/32 -bimap le0 1/32 -> 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.6/24 -> 1.2.3.4/24 diff --git a/contrib/ipfilter/test/regress/in4 b/contrib/ipfilter/test/regress/in4 deleted file mode 100644 index 46bbd81..0000000 --- a/contrib/ipfilter/test/regress/in4 +++ /dev/null @@ -1,5 +0,0 @@ -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 -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/regress/in5 b/contrib/ipfilter/test/regress/in5 deleted file mode 100644 index 766c3e3..0000000 --- a/contrib/ipfilter/test/regress/in5 +++ /dev/null @@ -1,24 +0,0 @@ -map le0 from 9.8.7.6/32 port > 1024 to any -> 1.1.1.1 portmap 10000:20000 tcp -map le0 from 9.8.7.6/32 port > 1024 to ! 1.2.3.4 -> 1.1.1.1 portmap 10000:20000 tcp -rdr le0 from any to 9.8.7.6/32 port = 0 -> 1.1.1.1 port 0 tcp -rdr le0 from any to 9.8.7.6/0xffffffff port = 0 -> 1.1.1.1 port 0 ip -rdr le0 ! from 1.2.3.4 to 9.8.7.6 port = 8888 -> 1.1.1.1 port 888 tcp -rdr le0 from any to 9.8.7.6/255.255.255.255 port = 8888 -> 1.1.1.1 port 888 ip -rdr le0 from any to 9.8.7.6 mask 0xffffffff port = 8888 -> 1.1.1.1 port 888 tcp -rdr le0 from any to 9.8.7.6 mask 255.255.255.255 port = 8888 -> 1.1.1.1 port 888 udp -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp/udp -rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 888 icmp -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin -rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 0 ip frag -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 icmp frag -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag -rdr le0 from any 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 any to 9.8.7.6/32 -> 1.1.1.1 port 0 ip frag age 10 -rdr le0 from any to 9.8.7.6/32 port = 0 -> 1.1.1.1 port 0 ip frag age 10/20 -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 icmp frag age 10 -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag age 20 -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag age 30 -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag age 40 diff --git a/contrib/ipfilter/test/regress/in6 b/contrib/ipfilter/test/regress/in6 deleted file mode 100644 index 70e71dd..0000000 --- a/contrib/ipfilter/test/regress/in6 +++ /dev/null @@ -1,8 +0,0 @@ -map foo0 from any port = 1 to any port != 0 -> 0/32 udp -map foo0 from any port eq 1 to any port ne 0 -> 0/32 udp -map foo0 from any port < 1 to any port > 0 -> 0/32 tcp -map foo0 from any port lt 1 to any port gt 0 -> 0/32 tcp -map foo0 from any port <= 1 to any port >= 0 -> 0/32 tcp/udp -map foo0 from any port le 1 to any port ge 0 -> 0/32 tcp/udp -map foo0 from any port 1 >< 20 to any port 20 <> 40 -> 0/32 tcp/udp -map foo0 from any port 10:20 to any port 30:40 -> 0/32 tcp/udp diff --git a/contrib/ipfilter/test/regress/in7 b/contrib/ipfilter/test/regress/in7 deleted file mode 100644 index 792d600..0000000 --- a/contrib/ipfilter/test/regress/in7 +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/contrib/ipfilter/test/regress/ip1 b/contrib/ipfilter/test/regress/ip1 deleted file mode 100644 index c31ba25..0000000 --- a/contrib/ipfilter/test/regress/ip1 +++ /dev/null @@ -1,78 +0,0 @@ -#:%s/ \(number = [0-9]*\) \(type = [a-z]*\)/ \2 \1/g - -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; !2.2.0.0/16; 2.2.2.0/24; }; - -table role = ipf type = hash number = 2 - {; }; -table role = ipf type = hash number = 200 - { 0/0; 1/32; 1.2.3.4/32; }; -table role = nat type = hash number = 210 - { 0/0; 2/32; 1.2.3.4/32; }; -table role = auth type = hash number = 220 - { 0/0; 3/32; 1.2.3.4/32; }; -table role = count type = hash number = 230 - { 0/0; 4/32; 1.2.3.4/32; }; - -table role = ipf type = hash number = 240 seed = 101 - { 0/0; 1/32; 1.2.3.4/32; }; -table role = nat type = hash number = 250 seed = 101 - { 0/0; 2/32; 1.2.3.4/32; }; -table role = auth type = hash number = 260 seed = 101 - { 0/0; 3/32; 1.2.3.4/32; }; -table role = count type = hash number = 270 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 group = 303 - { 0/0; 5/32; 1.2.3.4/32; }; -group-map in role = nat number = 300 group = 303 - { 0/0; 6/32; 1.2.3.4/32; }; -group-map in role = auth number = 300 group = 303 - { 0/0; 7/32; 1.2.3.4/32; }; -group-map in role = count number = 300 group = 303 - { 0/0; 8/32; 1.2.3.4/32; }; - -group-map out role = ipf number = 400 group = 303 - { 0/0; 5/32; 1.2.3.4/32, group = 606; }; -group-map out role = nat number = 400 group = 303 - { 0/0; 6/32; 1.2.3.4/32, group = 606; }; -group-map out role = auth number = 400 group = 303 - { 0/0; 7/32; 1.2.3.4/32, group = 606; }; -group-map out role = count number = 400 group = 303 - { 0/0; 8/32; 1.2.3.4/32, group = 606; }; - -group-map in role = ipf number = 500 - { 0/0, group = 10; 5/32, group = 800; 1.2.3.4/32, group = 606; }; -group-map in role = nat number = 500 - { 0/0, group = 10; 6/32, group = 800; 1.2.3.4/32, group = 606; }; -group-map in role = auth number = 500 - { 0/0, group = 10; 7/32, group = 800; 1.2.3.4/32, group = 606; }; -group-map in role = count number = 500 - { 0/0, group = 10; 8/32, group = 800; 1.2.3.4/32, group = 606; }; - diff --git a/contrib/ipfilter/test/regress/ip2 b/contrib/ipfilter/test/regress/ip2 deleted file mode 100644 index 76f31b6..0000000 --- a/contrib/ipfilter/test/regress/ip2 +++ /dev/null @@ -1,2 +0,0 @@ -table role = ipf type = tree name = letters - { "file://input/ip2.data"; }; diff --git a/contrib/ipfilter/test/regress/ip3 b/contrib/ipfilter/test/regress/ip3 deleted file mode 100644 index 98d2b0b..0000000 --- a/contrib/ipfilter/test/regress/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 weighted 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;}; -pool nat/hash (name noproxy; size 17;) - { 1.1.1.1; 2.2.2.2;}; -pool nat/tree (name raw;) - { 1.1.1.1; 2.2.2.2;}; -pool all/dstlist (name jill; policy random;) - { 1.1.1.1; bge0:2.2.2.2;}; -pool all/hash (name noproxy; size 17;) - { 1.1.1.1; 2.2.2.2;}; diff --git a/contrib/ipfilter/test/regress/ipf6-1 b/contrib/ipfilter/test/regress/ipf6-1 deleted file mode 100644 index 814dfd6..0000000 --- a/contrib/ipfilter/test/regress/ipf6-1 +++ /dev/null @@ -1,3 +0,0 @@ -block in all -block out all -pass out proto 58 all keep state diff --git a/contrib/ipfilter/test/regress/ipv6.1 b/contrib/ipfilter/test/regress/ipv6.1 deleted file mode 100644 index fc532b6..0000000 --- a/contrib/ipfilter/test/regress/ipv6.1 +++ /dev/null @@ -1 +0,0 @@ -pass out log quick on gif0 proto udp from ef00:1001:2002::/48 to any port 33433 >< 34000 keep state diff --git a/contrib/ipfilter/test/regress/ipv6.2 b/contrib/ipfilter/test/regress/ipv6.2 deleted file mode 100644 index 814dfd6..0000000 --- a/contrib/ipfilter/test/regress/ipv6.2 +++ /dev/null @@ -1,3 +0,0 @@ -block in all -block out all -pass out proto 58 all keep state diff --git a/contrib/ipfilter/test/regress/ipv6.3 b/contrib/ipfilter/test/regress/ipv6.3 deleted file mode 100644 index 6dc9e93..0000000 --- a/contrib/ipfilter/test/regress/ipv6.3 +++ /dev/null @@ -1 +0,0 @@ -pass out log quick on gif0 proto ipv6-icmp from any to any icmp-type 128 keep state diff --git a/contrib/ipfilter/test/regress/ipv6.4 b/contrib/ipfilter/test/regress/ipv6.4 deleted file mode 100644 index b221744..0000000 --- a/contrib/ipfilter/test/regress/ipv6.4 +++ /dev/null @@ -1,3 +0,0 @@ -pass in proto ipv6-icmp all icmp-type echo keep frags -pass in proto ipv6-icmp all icmp-type echo keep frags keep state -pass in proto tcp all keep frags keep state diff --git a/contrib/ipfilter/test/regress/ipv6.5 b/contrib/ipfilter/test/regress/ipv6.5 deleted file mode 100644 index d9ae23b..0000000 --- a/contrib/ipfilter/test/regress/ipv6.5 +++ /dev/null @@ -1,2 +0,0 @@ -pass out family inet6 all with v6hdr routing -block out family inet6 proto tcp all with v6hdr routing diff --git a/contrib/ipfilter/test/regress/ipv6.6 b/contrib/ipfilter/test/regress/ipv6.6 deleted file mode 100644 index 19a4df9..0000000 --- a/contrib/ipfilter/test/regress/ipv6.6 +++ /dev/null @@ -1,2 +0,0 @@ -pass out on gif0 proto udp all keep frag -block out all with bad diff --git a/contrib/ipfilter/test/regress/l1 b/contrib/ipfilter/test/regress/l1 deleted file mode 100644 index 88cca58..0000000 --- a/contrib/ipfilter/test/regress/l1 +++ /dev/null @@ -1,6 +0,0 @@ -log in all -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 -pass in log quick proto tcp from 1.1.1.1 to any flags S keep state -pass in log first quick proto tcp from 1.1.1.1 to any flags S keep state diff --git a/contrib/ipfilter/test/regress/n1 b/contrib/ipfilter/test/regress/n1 deleted file mode 100644 index 9bcf29b..0000000 --- a/contrib/ipfilter/test/regress/n1 +++ /dev/null @@ -1,3 +0,0 @@ -map zx0 10.1.1.1/32 -> 10.2.2.2/32 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 -map zx0 10.1.1.0/24 -> 10.3.4.0/24 diff --git a/contrib/ipfilter/test/regress/n10 b/contrib/ipfilter/test/regress/n10 deleted file mode 100644 index 0f48192..0000000 --- a/contrib/ipfilter/test/regress/n10 +++ /dev/null @@ -1,3 +0,0 @@ -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 100 -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 1000 -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 10000 diff --git a/contrib/ipfilter/test/regress/n100 b/contrib/ipfilter/test/regress/n100 deleted file mode 100644 index a8b6dee..0000000 --- a/contrib/ipfilter/test/regress/n100 +++ /dev/null @@ -1 +0,0 @@ -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; diff --git a/contrib/ipfilter/test/regress/n101 b/contrib/ipfilter/test/regress/n101 deleted file mode 100644 index 2f5fcd9..0000000 --- a/contrib/ipfilter/test/regress/n101 +++ /dev/null @@ -1 +0,0 @@ -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; diff --git a/contrib/ipfilter/test/regress/n102 b/contrib/ipfilter/test/regress/n102 deleted file mode 100644 index f056633..0000000 --- a/contrib/ipfilter/test/regress/n102 +++ /dev/null @@ -1 +0,0 @@ -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; diff --git a/contrib/ipfilter/test/regress/n103 b/contrib/ipfilter/test/regress/n103 deleted file mode 100644 index c3c27d6..0000000 --- a/contrib/ipfilter/test/regress/n103 +++ /dev/null @@ -1 +0,0 @@ -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; diff --git a/contrib/ipfilter/test/regress/n104 b/contrib/ipfilter/test/regress/n104 deleted file mode 100644 index 785f0ad..0000000 --- a/contrib/ipfilter/test/regress/n104 +++ /dev/null @@ -1 +0,0 @@ -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; diff --git a/contrib/ipfilter/test/regress/n105 b/contrib/ipfilter/test/regress/n105 deleted file mode 100644 index afe8966..0000000 --- a/contrib/ipfilter/test/regress/n105 +++ /dev/null @@ -1 +0,0 @@ -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; diff --git a/contrib/ipfilter/test/regress/n106 b/contrib/ipfilter/test/regress/n106 deleted file mode 100644 index 6074ab0..0000000 --- a/contrib/ipfilter/test/regress/n106 +++ /dev/null @@ -1 +0,0 @@ -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; diff --git a/contrib/ipfilter/test/regress/n10_6 b/contrib/ipfilter/test/regress/n10_6 deleted file mode 100644 index 738152d..0000000 --- a/contrib/ipfilter/test/regress/n10_6 +++ /dev/null @@ -1,3 +0,0 @@ -map ppp0 any -> 203.203.203.203/128 mssclamp 100 -map ppp0 any -> 203.203.203.203/128 mssclamp 1000 -map ppp0 any -> 203.203.203.203/128 mssclamp 10000 diff --git a/contrib/ipfilter/test/regress/n11 b/contrib/ipfilter/test/regress/n11 deleted file mode 100644 index 8cdf7fc..0000000 --- a/contrib/ipfilter/test/regress/n11 +++ /dev/null @@ -1,3 +0,0 @@ -bimap zx0 10.1.1.1/32 -> 1.6.7.8/32 -bimap zx0 10.1.1.0/24 -> 10.2.2.2/32 -bimap zx0 10.1.1.0/24 -> 10.3.4.5/24 diff --git a/contrib/ipfilter/test/regress/n11_6 b/contrib/ipfilter/test/regress/n11_6 deleted file mode 100644 index 7b428cc..0000000 --- a/contrib/ipfilter/test/regress/n11_6 +++ /dev/null @@ -1,3 +0,0 @@ -bimap zx0 10:1:1::1/128 -> 1::6:7:8/128 -bimap zx0 10:1:1::/112 -> 10::2:2:2/128 -bimap zx0 10:1:1::/112 -> 10::3:4:5/112 diff --git a/contrib/ipfilter/test/regress/n12 b/contrib/ipfilter/test/regress/n12 deleted file mode 100644 index 933856b..0000000 --- a/contrib/ipfilter/test/regress/n12 +++ /dev/null @@ -1 +0,0 @@ -map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential diff --git a/contrib/ipfilter/test/regress/n12_6 b/contrib/ipfilter/test/regress/n12_6 deleted file mode 100644 index bf21848..0000000 --- a/contrib/ipfilter/test/regress/n12_6 +++ /dev/null @@ -1 +0,0 @@ -map le0 c0a8:7e00::/112 -> 0/128 portmap tcp/udp 10000:20000 diff --git a/contrib/ipfilter/test/regress/n13 b/contrib/ipfilter/test/regress/n13 deleted file mode 100644 index 8047930..0000000 --- a/contrib/ipfilter/test/regress/n13 +++ /dev/null @@ -1 +0,0 @@ -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 diff --git a/contrib/ipfilter/test/regress/n13_6 b/contrib/ipfilter/test/regress/n13_6 deleted file mode 100644 index c1d1646..0000000 --- a/contrib/ipfilter/test/regress/n13_6 +++ /dev/null @@ -1 +0,0 @@ -map le0 192:168:1::0/48 -> range 203:0:1::1:23-203:0:1::3:45 diff --git a/contrib/ipfilter/test/regress/n14 b/contrib/ipfilter/test/regress/n14 deleted file mode 100644 index 6f5d571..0000000 --- a/contrib/ipfilter/test/regress/n14 +++ /dev/null @@ -1 +0,0 @@ -rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky diff --git a/contrib/ipfilter/test/regress/n14_6 b/contrib/ipfilter/test/regress/n14_6 deleted file mode 100644 index 64e88ee..0000000 --- a/contrib/ipfilter/test/regress/n14_6 +++ /dev/null @@ -1 +0,0 @@ -rdr gre0 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky diff --git a/contrib/ipfilter/test/regress/n15 b/contrib/ipfilter/test/regress/n15 deleted file mode 100644 index 062b766..0000000 --- a/contrib/ipfilter/test/regress/n15 +++ /dev/null @@ -1,2 +0,0 @@ -rdr le0 0/0 port 80 -> 3.3.3.3 port 80 tcp -rdr le0 0/0 port 80 -> 3.3.3.3 port 80-88 tcp diff --git a/contrib/ipfilter/test/regress/n15_6 b/contrib/ipfilter/test/regress/n15_6 deleted file mode 100644 index e82dd82..0000000 --- a/contrib/ipfilter/test/regress/n15_6 +++ /dev/null @@ -1,2 +0,0 @@ -rdr le0 any port 80 -> 3:0:3::3:3 port 80 tcp -rdr le0 any port 80 -> 3:0:3::3:3 port 80-88 tcp diff --git a/contrib/ipfilter/test/regress/n16 b/contrib/ipfilter/test/regress/n16 deleted file mode 100644 index ff8958c..0000000 --- a/contrib/ipfilter/test/regress/n16 +++ /dev/null @@ -1 +0,0 @@ -rdr vlan0 from any to 69.248.79.193 port = 38136 -> 172.31.83.24 port 2013 udp diff --git a/contrib/ipfilter/test/regress/n16_6 b/contrib/ipfilter/test/regress/n16_6 deleted file mode 100644 index ff8958c..0000000 --- a/contrib/ipfilter/test/regress/n16_6 +++ /dev/null @@ -1 +0,0 @@ -rdr vlan0 from any to 69.248.79.193 port = 38136 -> 172.31.83.24 port 2013 udp diff --git a/contrib/ipfilter/test/regress/n17 b/contrib/ipfilter/test/regress/n17 deleted file mode 100644 index 213f51f..0000000 --- a/contrib/ipfilter/test/regress/n17 +++ /dev/null @@ -1 +0,0 @@ -bimap zx0 0/0 -> 1.1.1.3 diff --git a/contrib/ipfilter/test/regress/n17_6 b/contrib/ipfilter/test/regress/n17_6 deleted file mode 100644 index 08ef77a..0000000 --- a/contrib/ipfilter/test/regress/n17_6 +++ /dev/null @@ -1 +0,0 @@ -bimap zx0 any -> 1::1:1:3 diff --git a/contrib/ipfilter/test/regress/n18 b/contrib/ipfilter/test/regress/n18 deleted file mode 100644 index 792f136..0000000 --- a/contrib/ipfilter/test/regress/n18 +++ /dev/null @@ -1,3 +0,0 @@ -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4 sequential -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000 sequential -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000 sequential diff --git a/contrib/ipfilter/test/regress/n1_6 b/contrib/ipfilter/test/regress/n1_6 deleted file mode 100644 index 341f136..0000000 --- a/contrib/ipfilter/test/regress/n1_6 +++ /dev/null @@ -1,3 +0,0 @@ -map zx0 10:1:1::1/128 -> 10::2:2:2/128 -map zx0 10:1:1::/112 -> 10::3:4:5/128 -map zx0 10:1:1::/112 -> 10::3:4:0/112 diff --git a/contrib/ipfilter/test/regress/n2 b/contrib/ipfilter/test/regress/n2 deleted file mode 100644 index 39a4d72..0000000 --- a/contrib/ipfilter/test/regress/n2 +++ /dev/null @@ -1,4 +0,0 @@ -map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 sequential -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential diff --git a/contrib/ipfilter/test/regress/n200 b/contrib/ipfilter/test/regress/n200 deleted file mode 100644 index c792e54..0000000 --- a/contrib/ipfilter/test/regress/n200 +++ /dev/null @@ -1 +0,0 @@ -divert in on bar0 from any to any -> src 127.0.0.1,10101 dst 127.0.0.1,10101 udp; diff --git a/contrib/ipfilter/test/regress/n2_6 b/contrib/ipfilter/test/regress/n2_6 deleted file mode 100644 index 3a04f33..0000000 --- a/contrib/ipfilter/test/regress/n2_6 +++ /dev/null @@ -1,4 +0,0 @@ -map zx0 10:1:1::1/128 -> 10::2:2:2/128 portmap tcp 10000:20000 sequential -map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential -map zx0 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential -map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential diff --git a/contrib/ipfilter/test/regress/n3 b/contrib/ipfilter/test/regress/n3 deleted file mode 100644 index 82c83dd..0000000 --- a/contrib/ipfilter/test/regress/n3 +++ /dev/null @@ -1,2 +0,0 @@ -map zz0 10.1.0.0/16 -> 192.168.2.0/24 portmap tcp/udp auto -map-block zz0 10.1.0.0/16 -> 192.168.1.0/24 ports 252 diff --git a/contrib/ipfilter/test/regress/n4 b/contrib/ipfilter/test/regress/n4 deleted file mode 100644 index e7c0314..0000000 --- a/contrib/ipfilter/test/regress/n4 +++ /dev/null @@ -1,6 +0,0 @@ -rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 10.1.1.0/24 port 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 0/0 port 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 10.1.1.0/24 port 53 -> 10.2.2.1 port 10053 udp -rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1 port 0 tcp -rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1 port 0 ip diff --git a/contrib/ipfilter/test/regress/n4_6 b/contrib/ipfilter/test/regress/n4_6 deleted file mode 100644 index 72dad4c..0000000 --- a/contrib/ipfilter/test/regress/n4_6 +++ /dev/null @@ -1,6 +0,0 @@ -rdr zx0 10:1:1::1/128 port 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 10:1:1::/112 port 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 any port 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 10:1:1::/112 port 53 -> 10::2:2:1 port 10053 udp -rdr zx0 10:1:1::/112 port 0 -> 10::2:2:1 port 0 tcp -rdr zx0 10:1:1::/112 port 0 -> 10::2:2:1 port 0 ip diff --git a/contrib/ipfilter/test/regress/n5 b/contrib/ipfilter/test/regress/n5 deleted file mode 100644 index d9f1a88..0000000 --- a/contrib/ipfilter/test/regress/n5 +++ /dev/null @@ -1,6 +0,0 @@ -map zx0 10.1.1.1/32 -> 10.2.2.2/32 -map zx0 from 10.1.1.0/24 to 10.1.0.0/16 -> 10.3.4.5/32 -map zx0 from 10.1.1.0/24 ! to 10.1.0.0/16 -> 10.3.4.0/24 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential diff --git a/contrib/ipfilter/test/regress/n5_6 b/contrib/ipfilter/test/regress/n5_6 deleted file mode 100644 index acefd7b..0000000 --- a/contrib/ipfilter/test/regress/n5_6 +++ /dev/null @@ -1,6 +0,0 @@ -map zx0 10:1:1::1/128 -> 10::2:2:2/128 -map zx0 from 10:1:1::/112 to 10:1::/32 -> 10::3:4:5/128 -map zx0 from 10:1:1::/112 ! to 10:1::/32 -> 10::3:4:0/112 -map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential -map zx0 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential -map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential diff --git a/contrib/ipfilter/test/regress/n6 b/contrib/ipfilter/test/regress/n6 deleted file mode 100644 index 79f11a4..0000000 --- a/contrib/ipfilter/test/regress/n6 +++ /dev/null @@ -1,5 +0,0 @@ -rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 from any to 10.1.1.0/24 port = 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 from 10.2.0.0/16 to 10.1.1.0/24 port = 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 from 10.3.0.0/16 to 10.1.0.0/16 port = 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 ! from 10.2.0.0/16 to 10.1.1.0/24 port = 53 -> 10.2.2.1 port 10053 udp diff --git a/contrib/ipfilter/test/regress/n6_6 b/contrib/ipfilter/test/regress/n6_6 deleted file mode 100644 index 3491c6b..0000000 --- a/contrib/ipfilter/test/regress/n6_6 +++ /dev/null @@ -1,5 +0,0 @@ -rdr zx0 10:1:1::1/128 port 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 from any to 10:1:1::/112 port = 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 from 10::/32 to 10:1:1::/112 port = 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 from 10:3::/32 to 10:1::/32 port = 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 ! from 10::/32 to 10:1:1::/112 port = 53 -> 10::2:2:1 port 10053 udp diff --git a/contrib/ipfilter/test/regress/n7 b/contrib/ipfilter/test/regress/n7 deleted file mode 100644 index be995c2..0000000 --- a/contrib/ipfilter/test/regress/n7 +++ /dev/null @@ -1,3 +0,0 @@ -rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1 port 10023 tcp -rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1 port = 10023 tcp -rdr zx0 10.1.1.0/24 port 80 -> 10.2.2.1,1.2.2.129 port 3128 tcp diff --git a/contrib/ipfilter/test/regress/n7_6 b/contrib/ipfilter/test/regress/n7_6 deleted file mode 100644 index 88055f6..0000000 --- a/contrib/ipfilter/test/regress/n7_6 +++ /dev/null @@ -1,3 +0,0 @@ -rdr zx0 10:1:1::1/128 port 23-79 -> 10::2:2:1 port 10023 tcp -rdr zx0 10:1:1::1/128 port 23-79 -> 10::2:2:1 port = 10023 tcp -rdr zx0 10:1:1::/112 port 80 -> 10::2:2:1,1::2:2:129 port 3128 tcp diff --git a/contrib/ipfilter/test/regress/n8 b/contrib/ipfilter/test/regress/n8 deleted file mode 100644 index bf0e94f..0000000 --- a/contrib/ipfilter/test/regress/n8 +++ /dev/null @@ -1 +0,0 @@ -map icmp0 2.2.2.0/24 -> 10.10.10.0/24 diff --git a/contrib/ipfilter/test/regress/n8_6 b/contrib/ipfilter/test/regress/n8_6 deleted file mode 100644 index 2f96be0..0000000 --- a/contrib/ipfilter/test/regress/n8_6 +++ /dev/null @@ -1 +0,0 @@ -map icmp0 2::2:2:0/112 -> 10:10:10::/112 diff --git a/contrib/ipfilter/test/regress/n9 b/contrib/ipfilter/test/regress/n9 deleted file mode 100644 index 81a7ccd..0000000 --- a/contrib/ipfilter/test/regress/n9 +++ /dev/null @@ -1 +0,0 @@ -rdr icmp0 4.4.4.0/24 port 0 -> 10.10.10.1 port 0 ip diff --git a/contrib/ipfilter/test/regress/n9_6 b/contrib/ipfilter/test/regress/n9_6 deleted file mode 100644 index 31e4615..0000000 --- a/contrib/ipfilter/test/regress/n9_6 +++ /dev/null @@ -1 +0,0 @@ -rdr icmp0 4:4:4::/112 port 0 -> 10:10:10::1 port 0 ip diff --git a/contrib/ipfilter/test/regress/ni1.ipf b/contrib/ipfilter/test/regress/ni1.ipf deleted file mode 100644 index c7e5797..0000000 --- a/contrib/ipfilter/test/regress/ni1.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass out proto udp from any to any keep state -pass out proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni1.nat b/contrib/ipfilter/test/regress/ni1.nat deleted file mode 100644 index 077aab1..0000000 --- a/contrib/ipfilter/test/regress/ni1.nat +++ /dev/null @@ -1,3 +0,0 @@ -map df0 from 2.2.2.2/32 port 20000 >< 25000 to any -> 6.6.6.8/32 portmap udp 2000:2500 sequential -map df0 from 2.2.2.2/32 port 2000 >< 2500 to any -> 6.6.6.7/32 portmap udp 20000:25000 sequential -map df0 from 2.2.2.2/32 to any -> 6.6.6.6/32 diff --git a/contrib/ipfilter/test/regress/ni10.ipf b/contrib/ipfilter/test/regress/ni10.ipf deleted file mode 100644 index 4151b6e..0000000 --- a/contrib/ipfilter/test/regress/ni10.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass in proto udp from any to any keep state -pass in proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni10.nat b/contrib/ipfilter/test/regress/ni10.nat deleted file mode 100644 index 2a04ef7..0000000 --- a/contrib/ipfilter/test/regress/ni10.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 2.2.2.2/32 -> 6.6.6.6 diff --git a/contrib/ipfilter/test/regress/ni11.ipf b/contrib/ipfilter/test/regress/ni11.ipf deleted file mode 100644 index 4151b6e..0000000 --- a/contrib/ipfilter/test/regress/ni11.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass in proto udp from any to any keep state -pass in proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni11.nat b/contrib/ipfilter/test/regress/ni11.nat deleted file mode 100644 index 1d0018c..0000000 --- a/contrib/ipfilter/test/regress/ni11.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port 40000 tcp/udp diff --git a/contrib/ipfilter/test/regress/ni12.ipf b/contrib/ipfilter/test/regress/ni12.ipf deleted file mode 100644 index 4151b6e..0000000 --- a/contrib/ipfilter/test/regress/ni12.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass in proto udp from any to any keep state -pass in proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni12.nat b/contrib/ipfilter/test/regress/ni12.nat deleted file mode 100644 index 8c36bc8..0000000 --- a/contrib/ipfilter/test/regress/ni12.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port = 40000 tcp/udp diff --git a/contrib/ipfilter/test/regress/ni13.ipf b/contrib/ipfilter/test/regress/ni13.ipf deleted file mode 100644 index 04b6d13..0000000 --- a/contrib/ipfilter/test/regress/ni13.ipf +++ /dev/null @@ -1,3 +0,0 @@ -pass in quick on pcn1 proto tcp from any to any port = 1723 keep state -block in all -block out all diff --git a/contrib/ipfilter/test/regress/ni13.nat b/contrib/ipfilter/test/regress/ni13.nat deleted file mode 100644 index ac2be49..0000000 --- a/contrib/ipfilter/test/regress/ni13.nat +++ /dev/null @@ -1 +0,0 @@ -rdr pcn1 192.168.113.3/32 port 1723 -> 0.0.0.0 port 1723 tcp proxy pptp diff --git a/contrib/ipfilter/test/regress/ni14.ipf b/contrib/ipfilter/test/regress/ni14.ipf deleted file mode 100644 index 04b6d13..0000000 --- a/contrib/ipfilter/test/regress/ni14.ipf +++ /dev/null @@ -1,3 +0,0 @@ -pass in quick on pcn1 proto tcp from any to any port = 1723 keep state -block in all -block out all diff --git a/contrib/ipfilter/test/regress/ni14.nat b/contrib/ipfilter/test/regress/ni14.nat deleted file mode 100644 index 72a8a4a..0000000 --- a/contrib/ipfilter/test/regress/ni14.nat +++ /dev/null @@ -1 +0,0 @@ -rdr pcn1 192.168.113.3/32 port 1723 -> 127.0.0.1 port 1723 tcp proxy pptp diff --git a/contrib/ipfilter/test/regress/ni15.ipf b/contrib/ipfilter/test/regress/ni15.ipf deleted file mode 100644 index 1b9a013..0000000 --- a/contrib/ipfilter/test/regress/ni15.ipf +++ /dev/null @@ -1,3 +0,0 @@ -pass out quick on pcn1 proto tcp from any to any port = 1723 keep state -block in all -block out all diff --git a/contrib/ipfilter/test/regress/ni15.nat b/contrib/ipfilter/test/regress/ni15.nat deleted file mode 100644 index 420c7b7..0000000 --- a/contrib/ipfilter/test/regress/ni15.nat +++ /dev/null @@ -1 +0,0 @@ -map pcn1 0/0 -> 0/0 proxy port 1723 pptp/tcp diff --git a/contrib/ipfilter/test/regress/ni16.ipf b/contrib/ipfilter/test/regress/ni16.ipf deleted file mode 100644 index 1b9a013..0000000 --- a/contrib/ipfilter/test/regress/ni16.ipf +++ /dev/null @@ -1,3 +0,0 @@ -pass out quick on pcn1 proto tcp from any to any port = 1723 keep state -block in all -block out all diff --git a/contrib/ipfilter/test/regress/ni16.nat b/contrib/ipfilter/test/regress/ni16.nat deleted file mode 100644 index 5fad3cd..0000000 --- a/contrib/ipfilter/test/regress/ni16.nat +++ /dev/null @@ -1 +0,0 @@ -map pcn1 10.2.2.2/32 -> 0/32 proxy port 1723 pptp/tcp diff --git a/contrib/ipfilter/test/regress/ni17.ipf b/contrib/ipfilter/test/regress/ni17.ipf deleted file mode 100644 index e69de29..0000000 --- a/contrib/ipfilter/test/regress/ni17.ipf +++ /dev/null diff --git a/contrib/ipfilter/test/regress/ni17.nat b/contrib/ipfilter/test/regress/ni17.nat deleted file mode 100644 index 3da6338..0000000 --- a/contrib/ipfilter/test/regress/ni17.nat +++ /dev/null @@ -1,4 +0,0 @@ -rdr le0 0/0 port 80 -> 10.1.1.252 port 3128 tcp round-robin -rdr le0 0/0 port 80 -> 10.1.2.252 port 3128 tcp round-robin -rdr le0 0/0 port 80 -> 10.1.3.252 port 3128 tcp round-robin sticky -rdr le0 0/0 port 80 -> 10.1.1.253,10.1.2.253 port 3128 tcp round-robin sticky diff --git a/contrib/ipfilter/test/regress/ni18.ipf b/contrib/ipfilter/test/regress/ni18.ipf deleted file mode 100644 index e69de29..0000000 --- a/contrib/ipfilter/test/regress/ni18.ipf +++ /dev/null diff --git a/contrib/ipfilter/test/regress/ni18.nat b/contrib/ipfilter/test/regress/ni18.nat deleted file mode 100644 index 40113c1..0000000 --- a/contrib/ipfilter/test/regress/ni18.nat +++ /dev/null @@ -1,4 +0,0 @@ -rdr hme0 192.168.1.0/24 port 80 -> 1.1.1.1 port 80 tcp; -no rdr hme0 192.168.1.1 port 80 tcp; -map hme1 10.1.0.0/16 -> 203.1.1.1/32 portmap tcp/udp 10000:20000 -no map hme1 10.1.1.0/24 tcp; diff --git a/contrib/ipfilter/test/regress/ni19.ipf b/contrib/ipfilter/test/regress/ni19.ipf deleted file mode 100644 index c6fcec1..0000000 --- a/contrib/ipfilter/test/regress/ni19.ipf +++ /dev/null @@ -1,3 +0,0 @@ -block in all -pass out quick on bge0 proto tcp from any to any port = shell flags S keep state -block out all diff --git a/contrib/ipfilter/test/regress/ni19.nat b/contrib/ipfilter/test/regress/ni19.nat deleted file mode 100644 index 56b81a9..0000000 --- a/contrib/ipfilter/test/regress/ni19.nat +++ /dev/null @@ -1 +0,0 @@ -map bge0 192.168.113.0/24 -> 10.1.1.1/32 proxy port shell rcmd/tcp diff --git a/contrib/ipfilter/test/regress/ni2.ipf b/contrib/ipfilter/test/regress/ni2.ipf deleted file mode 100644 index 5956cf9..0000000 --- a/contrib/ipfilter/test/regress/ni2.ipf +++ /dev/null @@ -1 +0,0 @@ -pass out quick proto tcp from any to any flags S/SAFR keep state diff --git a/contrib/ipfilter/test/regress/ni2.nat b/contrib/ipfilter/test/regress/ni2.nat deleted file mode 100644 index 43d2c83..0000000 --- a/contrib/ipfilter/test/regress/ni2.nat +++ /dev/null @@ -1 +0,0 @@ -map xl0 10.0.0.0/8 -> 1.1.1.1/32 portmap tcp/udp 40000:60000 sequential diff --git a/contrib/ipfilter/test/regress/ni20.ipf b/contrib/ipfilter/test/regress/ni20.ipf deleted file mode 100644 index c6f6d84..0000000 --- a/contrib/ipfilter/test/regress/ni20.ipf +++ /dev/null @@ -1,3 +0,0 @@ -block in all -pass in quick on bge0 proto tcp from any to any port = shell flags S keep state -block out all diff --git a/contrib/ipfilter/test/regress/ni20.nat b/contrib/ipfilter/test/regress/ni20.nat deleted file mode 100644 index f2dd0a7..0000000 --- a/contrib/ipfilter/test/regress/ni20.nat +++ /dev/null @@ -1 +0,0 @@ -rdr bge0 10.1.1.4/32 port shell -> 192.168.113.4 port shell tcp proxy rcmd diff --git a/contrib/ipfilter/test/regress/ni21.ipf b/contrib/ipfilter/test/regress/ni21.ipf deleted file mode 100644 index 6d6ed08..0000000 --- a/contrib/ipfilter/test/regress/ni21.ipf +++ /dev/null @@ -1 +0,0 @@ -pass out on lan0 to eri0:1.1.1.1 from 2.2.2.2 to any diff --git a/contrib/ipfilter/test/regress/ni21.nat b/contrib/ipfilter/test/regress/ni21.nat deleted file mode 100644 index 6b2d46a..0000000 --- a/contrib/ipfilter/test/regress/ni21.nat +++ /dev/null @@ -1 +0,0 @@ -map lan0,eri0 2.2.2.2 -> 4.4.4.4 diff --git a/contrib/ipfilter/test/regress/ni23.ipf b/contrib/ipfilter/test/regress/ni23.ipf deleted file mode 100644 index 49ebcf7..0000000 --- a/contrib/ipfilter/test/regress/ni23.ipf +++ /dev/null @@ -1,3 +0,0 @@ -block out all -block in all -pass in on le0,hme0 out-via ppp0,bge0 to ppp0:3.3.3.254 proto udp all keep state diff --git a/contrib/ipfilter/test/regress/ni23.nat b/contrib/ipfilter/test/regress/ni23.nat deleted file mode 100644 index 094d377..0000000 --- a/contrib/ipfilter/test/regress/ni23.nat +++ /dev/null @@ -1,2 +0,0 @@ -rdr le0,bge0 1.1.0.0/16 -> 2.2.2.2 -map hme0,ppp0 3.3.3.0/24 -> 4.4.4.4/32 diff --git a/contrib/ipfilter/test/regress/ni3.ipf b/contrib/ipfilter/test/regress/ni3.ipf deleted file mode 100644 index c7e5797..0000000 --- a/contrib/ipfilter/test/regress/ni3.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass out proto udp from any to any keep state -pass out proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni3.nat b/contrib/ipfilter/test/regress/ni3.nat deleted file mode 100644 index 4306f4b..0000000 --- a/contrib/ipfilter/test/regress/ni3.nat +++ /dev/null @@ -1 +0,0 @@ -map df0 2.2.2.2/32 -> 6.6.6.6/32 diff --git a/contrib/ipfilter/test/regress/ni4.ipf b/contrib/ipfilter/test/regress/ni4.ipf deleted file mode 100644 index c7e5797..0000000 --- a/contrib/ipfilter/test/regress/ni4.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass out proto udp from any to any keep state -pass out proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni4.nat b/contrib/ipfilter/test/regress/ni4.nat deleted file mode 100644 index e9d5cc1..0000000 --- a/contrib/ipfilter/test/regress/ni4.nat +++ /dev/null @@ -1 +0,0 @@ -map df0 2.2.2.2/32 -> 6.6.6.6/32 portmap tcp/udp 40000:60000 sequential diff --git a/contrib/ipfilter/test/regress/ni5.ipf b/contrib/ipfilter/test/regress/ni5.ipf deleted file mode 100644 index 8f11424..0000000 --- a/contrib/ipfilter/test/regress/ni5.ipf +++ /dev/null @@ -1,3 +0,0 @@ -block in all -pass out quick on ppp0 proto tcp from any to any port = ftp flags S keep state -block out all diff --git a/contrib/ipfilter/test/regress/ni5.nat b/contrib/ipfilter/test/regress/ni5.nat deleted file mode 100644 index 8e80d22..0000000 --- a/contrib/ipfilter/test/regress/ni5.nat +++ /dev/null @@ -1 +0,0 @@ -map ppp0 192.168.1.0/24 -> 1.1.1.1/32 proxy port ftp ftp/tcp diff --git a/contrib/ipfilter/test/regress/ni6.ipf b/contrib/ipfilter/test/regress/ni6.ipf deleted file mode 100644 index f5b83b2..0000000 --- a/contrib/ipfilter/test/regress/ni6.ipf +++ /dev/null @@ -1,9 +0,0 @@ -block out log quick on qfe0 from 192.168.7.0/24 to any -block out log quick on nf0 from 192.168.6.0/24 to any -pass in quick on nf0 proto tcp from any to any port = 111 flags S keep state -pass in quick on nf0 proto udp from any to any port = 111 keep state -block return-rst in log quick on nf0 proto tcp from any to any -block in log quick on nf0 from 192.168.7.0/24 to any -block return-rst in log quick on qfe0 proto tcp from any to any -block in log quick on qfe0 from 192.168.6.0/24 to any - diff --git a/contrib/ipfilter/test/regress/ni6.nat b/contrib/ipfilter/test/regress/ni6.nat deleted file mode 100644 index 00d57d0..0000000 --- a/contrib/ipfilter/test/regress/ni6.nat +++ /dev/null @@ -1,3 +0,0 @@ -rdr nf0 192.168.6.2 port 111 -> 192.168.7.1 port 111 udp proxy rpcbu -rdr nf0 192.168.6.2 port 111 -> 192.168.7.1 port 111 tcp proxy rpcbt -map qfe0 192.168.6.0/24 -> 192.168.7.2/32 diff --git a/contrib/ipfilter/test/regress/ni7.ipf b/contrib/ipfilter/test/regress/ni7.ipf deleted file mode 100644 index 4151b6e..0000000 --- a/contrib/ipfilter/test/regress/ni7.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass in proto udp from any to any keep state -pass in proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni7.nat b/contrib/ipfilter/test/regress/ni7.nat deleted file mode 100644 index 2a04ef7..0000000 --- a/contrib/ipfilter/test/regress/ni7.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 2.2.2.2/32 -> 6.6.6.6 diff --git a/contrib/ipfilter/test/regress/ni8.ipf b/contrib/ipfilter/test/regress/ni8.ipf deleted file mode 100644 index 6666241..0000000 --- a/contrib/ipfilter/test/regress/ni8.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in quick proto tcp from any to any flags S/SAFR keep state diff --git a/contrib/ipfilter/test/regress/ni8.nat b/contrib/ipfilter/test/regress/ni8.nat deleted file mode 100644 index 1d0018c..0000000 --- a/contrib/ipfilter/test/regress/ni8.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port 40000 tcp/udp diff --git a/contrib/ipfilter/test/regress/ni9.ipf b/contrib/ipfilter/test/regress/ni9.ipf deleted file mode 100644 index 6666241..0000000 --- a/contrib/ipfilter/test/regress/ni9.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in quick proto tcp from any to any flags S/SAFR keep state diff --git a/contrib/ipfilter/test/regress/ni9.nat b/contrib/ipfilter/test/regress/ni9.nat deleted file mode 100644 index 8c36bc8..0000000 --- a/contrib/ipfilter/test/regress/ni9.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port = 40000 tcp/udp diff --git a/contrib/ipfilter/test/regress/p1.ipf b/contrib/ipfilter/test/regress/p1.ipf deleted file mode 100644 index acaf639..0000000 --- a/contrib/ipfilter/test/regress/p1.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in from pool/100 to any diff --git a/contrib/ipfilter/test/regress/p1.pool b/contrib/ipfilter/test/regress/p1.pool deleted file mode 100644 index aa262a7..0000000 --- a/contrib/ipfilter/test/regress/p1.pool +++ /dev/null @@ -1,2 +0,0 @@ -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; }; diff --git a/contrib/ipfilter/test/regress/p10.nat b/contrib/ipfilter/test/regress/p10.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p10.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p10.pool b/contrib/ipfilter/test/regress/p10.pool deleted file mode 100644 index 2be554a..0000000 --- a/contrib/ipfilter/test/regress/p10.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy hash;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/regress/p11.nat b/contrib/ipfilter/test/regress/p11.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p11.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p11.pool b/contrib/ipfilter/test/regress/p11.pool deleted file mode 100644 index a79d9ea..0000000 --- a/contrib/ipfilter/test/regress/p11.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy dst-hash;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/regress/p12.nat b/contrib/ipfilter/test/regress/p12.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p12.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p12.pool b/contrib/ipfilter/test/regress/p12.pool deleted file mode 100644 index c9afcda..0000000 --- a/contrib/ipfilter/test/regress/p12.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy src-hash;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/regress/p13.ipf b/contrib/ipfilter/test/regress/p13.ipf deleted file mode 100644 index acaf639..0000000 --- a/contrib/ipfilter/test/regress/p13.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in from pool/100 to any diff --git a/contrib/ipfilter/test/regress/p13.pool b/contrib/ipfilter/test/regress/p13.pool deleted file mode 100644 index de80f72..0000000 --- a/contrib/ipfilter/test/regress/p13.pool +++ /dev/null @@ -1,2 +0,0 @@ -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; }; diff --git a/contrib/ipfilter/test/regress/p2.ipf b/contrib/ipfilter/test/regress/p2.ipf deleted file mode 100644 index 4cfb388..0000000 --- a/contrib/ipfilter/test/regress/p2.ipf +++ /dev/null @@ -1,2 +0,0 @@ -pass out from hash=(127.0.0.1,4.4.0.0/16) to any -block in from hash=(127.0.0.1,4.4.0.0/16) to any diff --git a/contrib/ipfilter/test/regress/p3.ipf b/contrib/ipfilter/test/regress/p3.ipf deleted file mode 100644 index a598d88..0000000 --- a/contrib/ipfilter/test/regress/p3.ipf +++ /dev/null @@ -1,6 +0,0 @@ -call now srcgrpmap/1010 in all -call now dstgrpmap/2010 out all -pass in all group 1020 -block in all group 1030 -pass out all group 2020 -block out all group 2040 diff --git a/contrib/ipfilter/test/regress/p3.pool b/contrib/ipfilter/test/regress/p3.pool deleted file mode 100644 index 3fadd59..0000000 --- a/contrib/ipfilter/test/regress/p3.pool +++ /dev/null @@ -1,4 +0,0 @@ -group-map in role = ipf number = 1010 - { 1.1.1.1/32, group = 1020; 3.3.0.0/16, group = 1030; }; -group-map out role = ipf number = 2010 group = 2020 - { 2.2.2.2/32; 4.4.0.0/16; 5.0.0.0/8, group = 2040; }; diff --git a/contrib/ipfilter/test/regress/p4.nat b/contrib/ipfilter/test/regress/p4.nat deleted file mode 100644 index d504ac9..0000000 --- a/contrib/ipfilter/test/regress/p4.nat +++ /dev/null @@ -1 +0,0 @@ -map * from pool/100 to any -> 1.2.3.4/32 diff --git a/contrib/ipfilter/test/regress/p4.pool b/contrib/ipfilter/test/regress/p4.pool deleted file mode 100644 index 6ed0e49..0000000 --- a/contrib/ipfilter/test/regress/p4.pool +++ /dev/null @@ -1,2 +0,0 @@ -table role = nat type = tree number = 100 - { 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; }; diff --git a/contrib/ipfilter/test/regress/p5.ipf b/contrib/ipfilter/test/regress/p5.ipf deleted file mode 100644 index ada9f56..0000000 --- a/contrib/ipfilter/test/regress/p5.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in from pool/letters to any diff --git a/contrib/ipfilter/test/regress/p5.pool b/contrib/ipfilter/test/regress/p5.pool deleted file mode 100644 index 9a8eaa3..0000000 --- a/contrib/ipfilter/test/regress/p5.pool +++ /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/regress/p6.ipf b/contrib/ipfilter/test/regress/p6.ipf deleted file mode 100644 index b9b8937..0000000 --- a/contrib/ipfilter/test/regress/p6.ipf +++ /dev/null @@ -1 +0,0 @@ -block in from pool/microsoft to any diff --git a/contrib/ipfilter/test/regress/p6.pool b/contrib/ipfilter/test/regress/p6.pool deleted file mode 100644 index 83e818c..0000000 --- a/contrib/ipfilter/test/regress/p6.pool +++ /dev/null @@ -1 +0,0 @@ -pool ipf/tree (name microsoft;) { whois file "regress/p6.whois"; }; diff --git a/contrib/ipfilter/test/regress/p6.whois b/contrib/ipfilter/test/regress/p6.whois deleted file mode 100644 index 284244e..0000000 --- a/contrib/ipfilter/test/regress/p6.whois +++ /dev/null @@ -1,241 +0,0 @@ -# This query resulted in more than 256 records. Remaining results -# have been truncated. For more specific results, go to -# http://ws.arin.net/whois for help in refining your query. -Microsoft Corp (MSFT) -Microsoft Corp., MSN Operations (MCMO) -MICROSOFT CORPORATION (MICRO-101) -MICROSOFT CORPORATION (MICRO-97) -MICROSOFT CORPORATION (MICRO-100) -Microsoft Corporation (MICRO-111) -MICROSOFT CORPORATION (MICRO-117) -Microsoft Corporation (ZM23-ARIN) noc@microsoft.com +1-425-882-8080 -Microsoft (ZM39-ARIN) noc@microsoft.com +1-425-882-8080 -Microsoft Corp (AS8068) MICROSOFT-CORP---MSN-AS-BLOCK 8068 - 8075 -Microsoft Corp (AS13811) MSLI 13811 -Microsoft Corp (AS14719) MICROSOFT-CORP-BCENTRAL 14719 -Microsoft Corp (AS3598) MICROSOFT-CORP-AS 3598 -Microsoft Corp (AS5761) MICROSOFT-CORP---MSN-AS---SATURN 5761 -Microsoft Corp (AS6182) MICROSOFT-CORP--MSN-AS-4 6182 -Microsoft Corp (AS6194) MICROSOFT-CORP--MSN-AS-3 6194 -Microsoft Corp (AS6291) MICROSOFT-CORP---MSN-AS 6291 -Microsoft Corp (AS13399) MICROSOFT-CORP---MSN-AS-2 13399 -Microsoft Corp (AS23468) MICROSOFT-CORP-XBOX-ONLINE 23468 -Microsoft Corp MICROSOFT (NET-131-107-0-0-1) 131.107.0.0 - 131.107.255.255 -Microsoft Corp MICROSOFT-VEXCEL (NET-192-92-90-0-1) 192.92.90.0 - 192.92.90.255 -Microsoft Corp NETBLK-MSOFT-NET (NET-198-105-232-0-1) 198.105.232.0 - 198.105.235.255 -Microsoft Corp MICROSOFT19-NET58 (NET-204-231-58-0-1) 204.231.58.0 - 204.231.58.255 -Microsoft Corp MICROSOFT15 (NET-204-140-77-0-1) 204.140.77.0 - 204.140.77.255 -Microsoft Corp MICROSOFT16 (NET-204-140-80-0-1) 204.140.80.0 - 204.140.83.255 -Microsoft Corp MICROSOFT-CORP-MSN-1 (NET-199-60-28-0-1) 199.60.28.0 - 199.60.28.255 -Microsoft Corp MICROSOFT-1 (NET-199-103-90-0-1) 199.103.90.0 - 199.103.91.255 -Microsoft Corp MICROSOFT-CORP-MSN-3 (NET-199-103-122-0-1) 199.103.122.0 - 199.103.122.255 -Microsoft Corp MICROSOFT8 (NET-204-79-101-0-1) 204.79.101.0 - 204.79.101.255 -Microsoft Corp MICROSOFT18 (NET-192-237-67-0-1) 192.237.67.0 - 192.237.67.255 -Microsoft Corp MICROSOFT19 (NET-198-137-97-0-1) 198.137.97.0 - 198.137.97.255 -Microsoft Corp MICROSOFT-HK (NET-204-79-135-0-1) 204.79.135.0 - 204.79.135.255 -Microsoft Corp MICROSOFT-PLACEWARE-1 (NET-204-79-179-0-1) 204.79.179.0 - 204.79.179.255 -Microsoft Corp MICROSOFT11 (NET-204-79-180-0-1) 204.79.180.0 - 204.79.181.255 -Microsoft Corp MICROSOFT-PLACEWARE-2 (NET-204-79-188-0-1) 204.79.188.0 - 204.79.188.255 -Microsoft Corp MICROSOFT13 (NET-204-79-195-0-1) 204.79.195.0 - 204.79.197.255 -Microsoft Corp MICROSOFT17 (NET-199-6-92-0-1) 199.6.92.0 - 199.6.94.255 -Microsoft Corp MICROSOFT-2 (NET-204-79-7-0-1) 204.79.7.0 - 204.79.7.255 -Microsoft Corp MICROSOFT-NET1 (NET-204-79-27-0-1) 204.79.27.0 - 204.79.27.255 -Microsoft Corp MICROSOFT2 (NET-198-180-74-0-1) 198.180.74.0 - 198.180.75.255 -Microsoft Corp MICROSOFT3 (NET-198-180-95-0-1) 198.180.95.0 - 198.180.97.255 -Microsoft Corp MICROSOFT28 (NET-204-231-236-0-1) 204.231.236.0 - 204.231.236.255 -Microsoft Corp MICROSOFT29 (NET-205-248-10-0-1) 205.248.10.0 - 205.248.15.255 -Microsoft Corp SPRINT-CDA33F (NET-205-163-63-0-1) 205.163.63.0 - 205.163.63.255 -Microsoft Corp SPRINT-CDA33E (NET-205-163-62-0-1) 205.163.62.0 - 205.163.62.255 -Microsoft Corp SPRINT-CDA39F (NET-205-163-144-0-1) 205.163.144.0 - 205.163.159.255 -Microsoft Corp MICROSOFT30 (NET-205-248-41-0-1) 205.248.41.0 - 205.248.43.255 -Microsoft Corp MICROSOFT31 (NET-205-248-50-0-1) 205.248.50.0 - 205.248.51.255 -Microsoft Corp MICROSOFT32 (NET-205-248-61-0-1) 205.248.61.0 - 205.248.63.255 -Microsoft Corp MICROSOFT34 (NET-205-248-72-0-1) 205.248.72.0 - 205.248.72.255 -Microsoft Corp MICROSOFT35 (NET-205-248-212-0-1) 205.248.212.0 - 205.248.215.255 -Microsoft Corp MICROSOFT36 (NET-205-248-228-0-1) 205.248.228.0 - 205.248.228.255 -Microsoft Corp MICROSOFT37 (NET-205-248-235-0-1) 205.248.235.0 - 205.248.235.255 -Microsoft Corp MICROSOFT20 (NET-204-231-76-0-1) 204.231.76.0 - 204.231.76.255 -Microsoft Corp MICROSOFT26 (NET-204-231-192-0-1) 204.231.192.0 - 204.231.192.255 -Microsoft Corp MICROSOFT27 (NET-204-231-194-0-1) 204.231.194.0 - 204.231.223.255 -Microsoft Corp SOCRATIC (NET-207-78-80-0-1) 207.78.80.0 - 207.78.80.255 -Microsoft Corp DAVELADD (NET-207-78-81-0-1) 207.78.81.0 - 207.78.81.255 -Microsoft Corp RSEGAL (NET-207-78-82-0-1) 207.78.82.0 - 207.78.82.255 -Microsoft Corp MICROSOFT44 (NET-205-248-243-0-1) 205.248.243.0 - 205.248.244.255 -Microsoft Corp MICROSOFT48 (NET-207-117-3-0-1) 207.117.3.0 - 207.117.3.255 -Microsoft Corp UU-207-18-117 (NET-207-18-117-0-1) 207.18.117.0 - 207.18.117.255 -Microsoft Corp CW-208-139-27-B (NET-208-139-27-0-1) 208.139.27.0 - 208.139.27.255 -Microsoft Corp MICROSOFT55 (NET-209-28-213-0-1) 209.28.213.0 - 209.28.213.255 -Microsoft Corp MICROSOFT50 (NET-207-209-68-0-1) 207.209.68.0 - 207.209.68.255 -Microsoft Corp SPRINT-CC5F6F (NET-204-95-96-0-1) 204.95.96.0 - 204.95.111.255 -Microsoft Corp CYBR-LCCLAB (NET-207-158-93-192-1) 207.158.93.192 - 207.158.93.223 -Microsoft Corp MSBPN-2 (NET-207-240-123-192-1) 207.240.123.192 - 207.240.123.223 -Microsoft Corp SPRINT-D01ACD (NET-208-26-205-0-1) 208.26.205.0 - 208.26.205.255 -Microsoft Corp MICROSOFT-CORP-MSN-2 (NET-192-197-157-0-1) 192.197.157.0 - 192.197.157.255 -Microsoft Corp MICROSOFTDENVER (NET-204-133-231-0-1) 204.133.231.0 - 204.133.231.255 -Microsoft Corp MICROSOFTG1-COM (NET-216-72-96-0-1) 216.72.96.0 - 216.72.99.255 -Microsoft Corp EACT-CUST-JLEZNEK (NET-207-229-166-152-1) 207.229.166.152 - 207.229.166.159 -Microsoft Corp SPRINT-CC5F95-8 (NET-204-95-149-0-1) 204.95.149.0 - 204.95.149.255 -Microsoft Corp NET-CSAMSI (NET-209-192-213-72-1) 209.192.213.72 - 209.192.213.79 -Microsoft Corp MICROSOFT57 (NET-206-73-203-0-1) 206.73.203.0 - 206.73.203.255 -Microsoft Corp MICROSOFT56 (NET-206-73-118-0-1) 206.73.118.0 - 206.73.118.255 -Microsoft Corp QWEST-208-45-54-16 (NET-208-45-54-16-1) 208.45.54.16 - 208.45.54.23 -Microsoft Corp QWEST-208-45-54-8 (NET-208-45-54-8-1) 208.45.54.8 - 208.45.54.15 -Microsoft Corp MICROSOFT58 (NET-206-73-31-0-1) 206.73.31.0 - 206.73.31.255 -Microsoft Corp SPRINT-3FA132 (NET-63-161-50-128-1) 63.161.50.128 - 63.161.50.255 -Microsoft Corp SPRINT-3FA132-6 (NET-63-161-50-0-1) 63.161.50.0 - 63.161.50.127 -Microsoft Corp MICROSOFT-8-18 (NET-207-240-8-224-1) 207.240.8.224 - 207.240.8.239 -Microsoft Corp MICROSOFT-BBLK (NET-157-54-0-0-1) 157.54.0.0 - 157.60.255.255 -Microsoft Corp QWEST-208-45-89-248A (NET-208-45-89-248-1) 208.45.89.248 - 208.45.89.255 -Microsoft Corp MICROSOFT61 (NET-206-182-69-0-1) 206.182.69.0 - 206.182.69.255 -Microsoft Corp MICROSOFT63 (NET-206-182-240-0-1) 206.182.240.0 - 206.182.240.255 -Microsoft Corp MICROSOFT64 (NET-206-182-241-0-1) 206.182.241.0 - 206.182.241.255 -Microsoft Corp MICROSOFT59 (NET-206-73-67-0-1) 206.73.67.0 - 206.73.67.255 -Microsoft Corp MICROSOFT66 (NET-206-182-251-0-1) 206.182.251.0 - 206.182.251.255 -Microsoft Corp MICROSOFT65 (NET-206-182-247-0-1) 206.182.247.0 - 206.182.247.255 -Microsoft Corp MICROSOFT62 (NET-206-182-236-0-1) 206.182.236.0 - 206.182.236.255 -Microsoft Corp QWEST-63-236-198-64 (NET-63-236-198-64-1) 63.236.198.64 - 63.236.198.71 -Microsoft Corp QWEST-63-236-198-152 (NET-63-236-198-152-1) 63.236.198.152 - 63.236.198.159 -Microsoft Corp ERMS-6799349 (NET-165-121-253-232-1) 165.121.253.232 - 165.121.253.239 -Microsoft Corp QWEST-63-236-170-64 (NET-63-236-170-64-1) 63.236.170.64 - 63.236.170.71 -Microsoft Corp QWEST-63-236-186-64 (NET-63-236-186-64-1) 63.236.186.64 - 63.236.186.71 -Microsoft Corp QWEST-63-236-187-104 (NET-63-236-187-104-1) 63.236.187.104 - 63.236.187.111 -Microsoft Corp QWEST-63-236-187-128 (NET-63-236-187-128-1) 63.236.187.128 - 63.236.187.135 -Microsoft Corp QWEST-63-236-187-160 (NET-63-236-187-160-1) 63.236.187.160 - 63.236.187.167 -Microsoft Corp FON-3338832128690 (NET-199-2-137-0-1) 199.2.137.0 - 199.2.137.255 -Microsoft Corp CUST-86-24614 (NET-216-222-104-224-1) 216.222.104.224 - 216.222.104.239 -Microsoft Corp QWEST-63-151-87-64 (NET-63-151-87-64-1) 63.151.87.64 - 63.151.87.71 -Microsoft Corp HP-64-77-82-96 (NET-64-77-82-96-1) 64.77.82.96 - 64.77.82.103 -Microsoft Corp HP-64-77-93-80 (NET-64-77-93-80-1) 64.77.93.80 - 64.77.93.95 -Microsoft Corp MICROSOFT-1BLK (NET-65-52-0-0-1) 65.52.0.0 - 65.55.255.255 -Microsoft Corp MICROSOFT-GLOBAL-NET (NET-207-46-0-0-1) 207.46.0.0 - 207.46.255.255 -Microsoft Corp MICROSOFT-CORP-MSN-BLK (NET-207-68-128-0-1) 207.68.128.0 - 207.68.207.255 -Microsoft Corp FON-343451648081865 (NET-204-182-144-0-1) 204.182.144.0 - 204.182.159.255 -Microsoft Corp FON-346312755281299 (NET-206-107-34-0-1) 206.107.34.0 - 206.107.34.255 -Microsoft Corp FON-34550983681918 (NET-205-240-158-0-1) 205.240.158.0 - 205.240.159.255 -Microsoft Corp MICROSOFT-PLACEWARE-2 (NET-204-79-252-0-1) 204.79.252.0 - 204.79.252.255 -Microsoft Corp WLCO-TWC1057147-MICROSOFT (NET-64-200-211-16-1) 64.200.211.16 - 64.200.211.31 -Microsoft Corp MICROSOF81-163-0 (NET-12-178-163-0-1) 12.178.163.0 - 12.178.163.31 -Microsoft Corp WLCO-TWC1057147-MICROSOFT-1 (NET-69-44-126-80-1) 69.44.126.80 - 69.44.126.95 -Microsoft Corp SPRINTLINK (NET-63-173-42-128-1) 63.173.42.128 - 63.173.42.255 -Microsoft Corp MICROSOF33-108-0 (NET-12-28-108-0-1) 12.28.108.0 - 12.28.108.127 -Microsoft Corp SPRINTLINK (NET-65-170-29-0-1) 65.170.29.0 - 65.170.29.7 -Microsoft Corp Q0903-67-132-133-96 (NET-67-132-133-96-1) 67.132.133.96 - 67.132.133.103 -Microsoft Corp MICROSOFT-IPV6-BLK (NET6-2001-4898-1) 2001:4898:0000:0000:0000:0000:0000:0000 - 2001:4898:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF -Microsoft Corp LVLT-MSFT-8-6-176 (NET-8-6-176-0-1) 8.6.176.0 - 8.6.176.255 -Microsoft Corp MICROSOFT33 (NET-205-248-80-0-1) 205.248.80.0 - 205.248.129.255 -Microsoft Corp Q0523-63-148-123-240 (NET-63-148-123-240-1) 63.148.123.240 - 63.148.123.247 -Microsoft Corp SAVV-S233608-1 (NET-64-41-193-0-1) 64.41.193.0 - 64.41.193.255 -Microsoft Corp SAVV-S233053-1 (NET-64-85-70-32-1) 64.85.70.32 - 64.85.70.47 -Microsoft Corp SAVV-S233053-2 (NET-64-85-81-96-1) 64.85.81.96 - 64.85.81.103 -Microsoft Corp SAVV-S233053-3 (NET-64-85-81-104-1) 64.85.81.104 - 64.85.81.111 -Microsoft Corp SAVV-S233053-7 (NET-216-32-168-224-1) 216.32.168.224 - 216.32.168.255 -Microsoft Corp SAVV-S233053-6 (NET-206-79-74-32-1) 206.79.74.32 - 206.79.74.47 -Microsoft Corp SAVV-S233053-8 (NET-216-32-175-224-1) 216.32.175.224 - 216.32.175.255 -Microsoft Corp SAVV-S233053-9 (NET-216-32-180-0-1) 216.32.180.0 - 216.32.183.255 -Microsoft Corp SAVV-S233053-11 (NET-216-33-229-224-1) 216.33.229.224 - 216.33.229.255 -Microsoft Corp SAVV-S233053-12 (NET-216-33-236-0-1) 216.33.236.0 - 216.33.239.255 -Microsoft Corp SAVV-S233053-13 (NET-216-33-240-0-1) 216.33.240.0 - 216.33.243.255 -Microsoft Corp SAVV-S233053-10 (NET-216-32-240-0-1) 216.32.240.0 - 216.32.243.255 -Microsoft Corp SAVV-S233608-3 (NET-216-34-51-0-1) 216.34.51.0 - 216.34.51.255 -Microsoft Corp SAVV-S233053-4 (NET-209-1-112-0-1) 209.1.112.0 - 209.1.112.255 -Microsoft Corp SAVV-S233053-5 (NET-209-1-113-0-1) 209.1.113.0 - 209.1.113.255 -Microsoft Corp SAVV-S233608-2 (NET-209-1-15-0-1) 209.1.15.0 - 209.1.15.255 -Microsoft Corp SAVV-S233608-4 (NET-216-34-53-176-1) 216.34.53.176 - 216.34.53.191 -Microsoft Corp SAVV-S233608-5 (NET-216-35-8-224-1) 216.35.8.224 - 216.35.8.239 -Microsoft Corp SAVV-S233053-14 (NET-209-185-128-0-1) 209.185.128.0 - 209.185.131.255 -Microsoft Corp Q0112-65-114-175-128 (NET-65-114-175-128-1) 65.114.175.128 - 65.114.175.159 -Microsoft Corp SAVV-S233053-15 (NET-64-15-229-96-1) 64.15.229.96 - 64.15.229.127 -Microsoft Corp SAVV-S233050-5 (NET-64-15-177-0-1) 64.15.177.0 - 64.15.177.255 -Microsoft Corp SAVV-S233050-4 (NET-64-15-170-192-1) 64.15.170.192 - 64.15.170.199 -Microsoft Corp SAVV-S233050-2 (NET-209-143-238-0-1) 209.143.238.0 - 209.143.238.255 -Microsoft Corp SAVV-S233050-6 (NET-64-15-178-0-1) 64.15.178.0 - 64.15.178.255 -Microsoft Corp SAVV-S232995-2 (NET-66-35-209-120-1) 66.35.209.120 - 66.35.209.127 -Microsoft Corp SAVV-S232995-3 (NET-66-35-211-128-1) 66.35.211.128 - 66.35.211.191 -Microsoft Corp SAVV-S232995-1 (NET-66-35-208-48-1) 66.35.208.48 - 66.35.208.63 -Microsoft Corp SAVV-S233053-16 (NET-216-33-148-0-1) 216.33.148.0 - 216.33.151.255 -Microsoft Corp., MSN Operations SAVV-S233052-4 (NET-216-35-66-88-1) 216.35.66.88 - 216.35.66.95 -MICROSOFT CORPORATION MICROSOF32-32-160 (NET-12-230-32-160-1) 12.230.32.160 - 12.230.32.167 -MICROSOFT CORPORATION MICROSOF43-124-0 (NET-12-53-124-0-1) 12.53.124.0 - 12.53.124.31 -MICROSOFT CORPORATION MICROSOF82-18-96 (NET-12-232-18-96-1) 12.232.18.96 - 12.232.18.127 -MICROSOFT CORPORATION MICROSOF25-158 (NET-12-190-158-0-1) 12.190.158.0 - 12.190.158.255 -MICROSOFT CORPORATION MICROSOF61-196-32 (NET-12-71-196-32-1) 12.71.196.32 - 12.71.196.47 -Microsoft Corporation MICROSOFT-ONLINE-SERVICES (NET-209-240-192-0-1) 209.240.192.0 - 209.240.223.255 -Microsoft Corporation MICROSOFT-DYNAMIC-HOSTING (NET-70-37-0-0-1) 70.37.0.0 - 70.37.191.255 -Microsoft Corporation MS-ONLINE-SERVICES-NJ (NET-70-37-128-0-1) 70.37.128.0 - 70.37.129.255 -Microsoft Corporation MS-GLOBAL-ONLINE-SERVICES (NET-70-37-135-0-1) 70.37.135.0 - 70.37.135.255 -MICROSOFT CORPORATION MICROSOF82-87-192 (NET-12-49-87-192-1) 12.49.87.192 - 12.49.87.255 -Microsoft MICROSOFT (NET-74-93-205-144-1) 74.93.205.144 - 74.93.205.151 -Microsoft MICROSOFT (NET-74-93-205-152-1) 74.93.205.152 - 74.93.205.159 -Microsoft MICROSOFT (NET-74-93-206-64-1) 74.93.206.64 - 74.93.206.71 -Microsoft MICROSOFT (NET-70-89-139-120-1) 70.89.139.120 - 70.89.139.127 -Microsoft DIRECP-NET1-206-71-11 (NET-206-71-119-0-1) 206.71.119.0 - 206.71.119.255 -Microsoft DIRECP-NET1-117 (NET-206-71-117-0-1) 206.71.117.0 - 206.71.117.255 -Microsoft DIRECP-NET1-118 (NET-206-71-118-0-1) 206.71.118.0 - 206.71.118.255 -Microsoft UUHIL-BLK1-C155-112 (NET-209-154-155-112-1) 209.154.155.112 - 209.154.155.119 -Microsoft SBCIS-101411-164355 (NET-65-68-62-152-1) 65.68.62.152 - 65.68.62.159 -MICROSOFT SBC067039208168020503 (NET-67-39-208-168-1) 67.39.208.168 - 67.39.208.175 -Microsoft UU-65-242-67 (NET-65-242-67-0-1) 65.242.67.0 - 65.242.67.255 -Microsoft CW-204-71-191-0 (NET-204-71-191-0-1) 204.71.191.0 - 204.71.191.255 -Microsoft SBC063194155144021023 (NET-63-194-155-144-1) 63.194.155.144 - 63.194.155.151 -Microsoft SBC066136085192030113 (NET-66-136-85-192-1) 66.136.85.192 - 66.136.85.199 -MICROSOFT MFN-T280-64-124-184-72-29 (NET-64-124-184-72-1) 64.124.184.72 - 64.124.184.79 -MICROSOFT MFN-T133-216-200-206-0-24 (NET-216-200-206-0-1) 216.200.206.0 - 216.200.206.255 -Microsoft UU-63-80-93-D4 (NET-63-80-93-0-1) 63.80.93.0 - 63.80.93.127 -Microsoft RSPC-1218167167199384 (NET-67-192-225-208-1) 67.192.225.208 - 67.192.225.223 -Microsoft CVNET-454AA20 (NET-69-74-162-0-1) 69.74.162.0 - 69.74.162.255 -Microsoft UU-65-221-5 (NET-65-221-5-0-1) 65.221.5.0 - 65.221.5.255 -Microsoft - Partner Campaign Builder (PCB) MICROSOFT-PARTNER-CAMPAIGN-BUILDER-PCB (NET-216-182-89-192-1) 216.182.89.192 - 216.182.89.207 -Microsoft - Partner Campaign Builder (PCB) MICROSOFT-PARTNER-CAMPAIGN-BUILDER-PCB (NET-216-182-89-48-1) 216.182.89.48 - 216.182.89.63 -MICROSOFT AUSTIN-STO UU-65-248-85-D4 (NET-65-248-85-0-1) 65.248.85.0 - 65.248.85.255 -Microsoft Canada MIC0923-CA (NET-199-243-157-192-1) 199.243.157.192 - 199.243.157.223 -Microsoft Canada MIC0702-CA (NET-199-243-157-112-1) 199.243.157.112 - 199.243.157.119 -Microsoft Corp UU-65-194-210-224 (NET-65-194-210-224-1) 65.194.210.224 - 65.194.210.255 -Microsoft Corp UU-208-194-139 (NET-208-194-139-0-1) 208.194.139.0 - 208.194.139.255 -Microsoft Corp UU-208-204-49-128-B (NET-208-204-49-128-1) 208.204.49.128 - 208.204.49.255 -Microsoft Corp UU-208-205-26 (NET-208-205-26-0-1) 208.205.26.0 - 208.205.26.255 -Microsoft Corp UU-208-217-184-D1 (NET-208-217-184-0-1) 208.217.184.0 - 208.217.187.255 -Microsoft Corp UU-208-222-172 (NET-208-222-172-0-1) 208.222.172.0 - 208.222.172.255 -Microsoft Corp UU-208-224-200-64 (NET-208-224-200-64-1) 208.224.200.64 - 208.224.200.95 -Microsoft Corp UU-208-229-100-D1 (NET-208-229-100-0-1) 208.229.100.0 - 208.229.101.255 -Microsoft Corp UU-208-241-19 (NET-208-241-19-0-1) 208.241.19.0 - 208.241.19.15 -Microsoft Corp UU-208-241-19-16 (NET-208-241-19-16-1) 208.241.19.16 - 208.241.19.31 -Microsoft Corp UU-208-241-9-224 (NET-208-241-9-224-1) 208.241.9.224 - 208.241.9.239 -Microsoft Corp UU-208-244-108-D2 (NET-208-244-108-0-1) 208.244.108.0 - 208.244.108.15 -Microsoft Corp UU-208-245-16 (NET-208-245-16-0-1) 208.245.16.0 - 208.245.16.31 -Microsoft Corp UU-208-249-17-160 (NET-208-249-17-160-1) 208.249.17.160 - 208.249.17.175 -Microsoft Corp UU-63-104-216-D2 (NET-63-104-216-0-1) 63.104.216.0 - 63.104.216.127 -Microsoft Corp UU-63-69-245 (NET-63-69-245-0-1) 63.69.245.0 - 63.69.245.255 -Microsoft Corp SBC068090141072031030 (NET-68-90-141-72-1) 68.90.141.72 - 68.90.141.79 -Microsoft Corp 10825385 SBC06319812316029040317151513 (NET-63-198-123-160-1) 63.198.123.160 - 63.198.123.167 -MICROSOFT CORP-040821020257 SBC06824804806429040821020303 (NET-68-248-48-64-1) 68.248.48.64 - 68.248.48.71 -MICROSOFT CORP-040821020338 SBC06824804807229040821020347 (NET-68-248-48-72-1) 68.248.48.72 - 68.248.48.79 -MICROSOFT CORP-081024181821 SBC-99-49-8-248-29-0810241850 (NET-99-49-8-248-1) 99.49.8.248 - 99.49.8.255 -Microsoft Corp. HUGE-65-38-172-72-29 (NET-65-38-172-72-1) 65.38.172.72 - 65.38.172.79 -Microsoft Corp. HUGE-65-38-172-96-28 (NET-65-38-172-96-1) 65.38.172.96 - 65.38.172.111 -Microsoft Corporation MICROSOFT-CORPORATION (NET-75-149-174-16-1) 75.149.174.16 - 75.149.174.23 -Microsoft Corporation MICROSOFT-CORPORATION (NET-75-151-100-240-1) 75.151.100.240 - 75.151.100.255 -Microsoft Corporation SPEK-647057-0 (NET-64-81-8-96-1) 64.81.8.96 - 64.81.8.127 -Microsoft Corporation SBC067112255144030130 (NET-67-112-255-144-1) 67.112.255.144 - 67.112.255.151 -Microsoft Corporation ATTENS-010075-004522 (NET-63-240-201-176-1) 63.240.201.176 - 63.240.201.191 -Microsoft Corporation ATTENS-010075-004523 (NET-206-16-209-208-1) 206.16.209.208 - 206.16.209.223 -Microsoft Corporation ATTENS-010075-004525 (NET-63-240-195-208-1) 63.240.195.208 - 63.240.195.223 -Microsoft Corporation ATTENS-010075-004526 (NET-206-16-204-64-1) 206.16.204.64 - 206.16.204.79 -Microsoft Corporation ATTENS-010075-004450 (NET-206-16-223-0-1) 206.16.223.0 - 206.16.223.255 -Microsoft Corporation ATTENS-010075-005028 (NET-63-240-216-0-1) 63.240.216.0 - 63.240.219.255 -Microsoft Corporation ATTENS-010075-005057 (NET-63-240-220-0-1) 63.240.220.0 - 63.240.223.255 -Microsoft Corporation ATTENS-010075-005135 (NET-206-16-246-24-1) 206.16.246.24 - 206.16.246.31 -Microsoft Corporation ATTENS-010075-004524 (NET-63-240-195-192-1) 63.240.195.192 - 63.240.195.207 -Microsoft Corporation ATTENS-010075-005880 (NET-206-16-224-160-1) 206.16.224.160 - 206.16.224.191 -Microsoft Corporation (managed segment) RSPC-1229444888833780 (NET-98-129-187-144-1) 98.129.187.144 - 98.129.187.151 -Microsoft Corporation - Secure Dimensions ( RSPC-33955-12072007 (NET-67-192-39-48-1) 67.192.39.48 - 67.192.39.63 -Microsoft Corporation - Whale RSPC-108457-1170047010 (NET-72-32-240-160-1) 72.32.240.160 - 72.32.240.175 -Microsoft Corporation - Whale RSPC-108456-1173386392 (NET-72-32-201-152-1) 72.32.201.152 - 72.32.201.159 -MICROSOFT CROP SBC067039081152020503 (NET-67-39-81-152-1) 67.39.81.152 - 67.39.81.159 -Microsoft Education Programs RSPC-48725-1096578571 (NET-69-20-127-32-1) 69.20.127.32 - 69.20.127.39 -Microsoft License PNAP-SFJ-MSLI-RM-01 (NET-216-52-28-0-1) 216.52.28.0 - 216.52.28.255 -Microsoft License INAP-PHX003-MSLICENSE-25271 (NET-70-42-230-0-1) 70.42.230.0 - 70.42.231.255 -Microsoft License INAP-SFJ-MSLICENSE-13982 (NET-63-251-97-0-1) 63.251.97.0 - 63.251.97.255 -Microsoft Licensing SBC067120132128020815 (NET-67-120-132-128-1) 67.120.132.128 - 67.120.132.135 -Microsoft Licensing SBC067120132152020815 (NET-67-120-132-152-1) 67.120.132.152 - 67.120.132.159 -Microsoft Licensing SBC067120132192020816 (NET-67-120-132-192-1) 67.120.132.192 - 67.120.132.207 -Microsoft Licensing SBC0671201322080208 diff --git a/contrib/ipfilter/test/regress/p7.nat b/contrib/ipfilter/test/regress/p7.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p7.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p7.pool b/contrib/ipfilter/test/regress/p7.pool deleted file mode 100644 index 451b374d..0000000 --- a/contrib/ipfilter/test/regress/p7.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy weighted connection;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/regress/p9.nat b/contrib/ipfilter/test/regress/p9.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p9.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p9.pool b/contrib/ipfilter/test/regress/p9.pool deleted file mode 100644 index c452ffc..0000000 --- a/contrib/ipfilter/test/regress/p9.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy round-robin;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/test.format b/contrib/ipfilter/test/test.format deleted file mode 100644 index 64f7d9b..0000000 --- a/contrib/ipfilter/test/test.format +++ /dev/null @@ -1,148 +0,0 @@ -#test input-format output-format options -bpf-f1 text text -bpf1 text text -f1 text text -f2 text text -f3 text text -f4 text text -f5 text text -f6 text text -f7 text text -f8 text text -f9 text text -f10 text text -f11 text text -D -f12 hex hex -f13 hex hex -f14 text text -f15 text text -f16 text text -f17 hex hex -f18 text text -D -f19 text text state_max=3 -f20 text text -f21 hex text -f22 hex text -i1 text ipf -i2 text ipf -i3 text ipf -i4 text ipf -i5 text ipf -i6 text ipf -i7 text ipf -i8 text ipf -i9 text ipf -i10 text ipf -i11 text ipf -i12 text ipf -i13 text ipf -i14 text ipf -i15 text ipf -i16 text ipf -i17 text ipftest -i18 text ipf -i19 text ipf -i20 text ipf -i21 text ipf -i22 text ipf -i23 text ipf -in1 text text -in2 text text -in3 text text -in4 text text -in5 text text -in6 text text -in7 text text -in8 text text -in100 text text -in101 text text -in102 text text -ip1 text text -ip2 text text -ip3 text text -ipv6.1 hex hex -ipv6.2 hex hex -ipv6.3 hex hex -ipv6.4 hex hex -ipv6.5 hex hex -l1 hex hex -n1 text text -n2 text text -n3 text text -n4 text text -n5 text text -n6 text text -n7 text text -n8 hex hex update_ipid=0 -n9 hex hex update_ipid=0 -n10 hex hex update_ipid=0 -n11 text text -n12 hex hex update_ipid=0 -v -n15 text text update_ipid=0 -n100 text text -n101 text text -n102 text text -n103 text text -n104 hex hex update_ipid=0 -n105 hex hex update_ipid=0 -n106 hex hex update_ipid=0 -n200 hex hex update_ipid=0 -ni1 hex hex update_ipid=1 -ni2 hex hex update_ipid=1 -ni3 hex hex update_ipid=1 -ni4 hex hex update_ipid=1 -ni5 hex hex update_ipid=1 -ni6 hex text update_ipid=1 -D -ni7 hex hex update_ipid=1 -ni8 hex hex update_ipid=1 -ni9 hex hex update_ipid=1 -ni10 hex hex update_ipid=1 -ni11 hex hex update_ipid=1 -ni12 hex hex update_ipid=1 -ni13 hex hex update_ipid=1 -ni14 hex hex update_ipid=1 -ni15 hex hex update_ipid=1 -ni16 hex hex update_ipid=1 -ni17 text text -ni18 text text -ni19 hex hex update_ipid=0 -ni20 hex hex update_ipid=0 -D -ni21 text text -ni23 text text -D -p1 text text -p2 text text -p3 text text -p4 text text -p5 text text -p6 text text -p7 text text -p9 text text -p10 text text -p11 text text -p12 text text -p13 text text -n16 hex hex -D -n17 hex hex -D -f24 hex text -ipv6.6 hex text -f25 hex text -D -f26 text text -f27 hex text -n1_6 text text -6 -n2_6 text text -6 -n4_6 text text -6 -n5_6 text text -6 -n6_6 text text -6 -n7_6 text text -6 -n8_6 hex hex -6D -n9_6 hex hex -6D -n11_6 text text -6 -n12_6 hex hex -D6 -n15_6 text text -6 -n17_6 hex hex -6 -n13 text text -n14 text text -n18 text text -D -f28 text text -f29 text text -f30 text text diff --git a/contrib/ipfilter/test/vfycksum.pl b/contrib/ipfilter/test/vfycksum.pl deleted file mode 100755 index 0272e4b..0000000 --- a/contrib/ipfilter/test/vfycksum.pl +++ /dev/null @@ -1,424 +0,0 @@ - -# -# validate the IPv4 header checksum. -# $bytes[] is an array of 16bit values, with $cnt elements in the array. -# -sub dump { - print "\n"; - for ($i = 0; $i < $#bytes; $i++) { - printf "%04x ", $bytes[$i]; - } - print "\n"; -} - -sub dosum { - local($seed) = $_[0]; - local($start) = $_[1]; - local($max) = $_[2]; - local($idx) = $start; - local($lsum) = $seed; - - for ($idx = $start, $lsum = $seed; $idx < $max; $idx++) { -#printf "%#x += %#x\n", $lsum, $bytes[$idx]; - $lsum += $bytes[$idx]; - } - while ($lsum > 0xffff) { - $lsum = ($lsum & 0xffff) + ($lsum >> 16); - } - $lsum = ~$lsum & 0xffff; - return $lsum; -} - - -sub ipv4addrsum { - local($b) = $_[0]; - local($as) = 0; - - $as += $bytes[$b + 6]; # source address - $as += $bytes[$b + 7]; - $as += $bytes[$b + 8]; # destination address - $as += $bytes[$b + 9]; - return ($as); -} - -sub ipv6addrsum { - local($b) = $_[0]; - local($as) = 0; - - $as += $bytes[$b + 4]; # source address - $as += $bytes[$b + 5]; - $as += $bytes[$b + 6]; - $as += $bytes[$b + 7]; - $as += $bytes[$b + 8]; - $as += $bytes[$b + 9]; - $as += $bytes[$b + 10]; - $as += $bytes[$b + 11]; - $as += $bytes[$b + 12]; # destination address - $as += $bytes[$b + 13]; - $as += $bytes[$b + 14]; - $as += $bytes[$b + 15]; - $as += $bytes[$b + 16]; - $as += $bytes[$b + 17]; - $as += $bytes[$b + 18]; - $as += $bytes[$b + 19]; - return ($as); -} - -sub tcpcommon { - local($base) = $_[0]; - local($hl) = $_[1]; - local($hs) = $_[2]; - local($lenoffset) = $_[3]; - - local($thl) = $bytes[$base + $hl + 6]; - $thl &= 0xf0; - $thl >>= 2; - - local($x) = $bytes[$base + $lenoffset]; - local($y) = ($cnt - $base) * 2; - local($z) = 0; - - if ($bytes[$base + $lenoffset] > ($cnt - $base) * 2) { - print "[cnt=$cnt base=$base]"; - $x = $bytes[$base + $lenoffset]; - $y = ($cnt - $base) * 2; - $z = 1; - } elsif (($cnt - $base) * 2 < $hl + $hl) { - $x = ($cnt - $base) * 2; - $y = $hl + 20; - $z = 2; - } elsif (($cnt - $base) * 2 < $hl + $thl) { - $x = ($cnt - $base) * 2; - $y = $hl + $thl; - $z = 3; - } elsif ($len < $thl) { - $x = ($cnt - $base) * 2; - $y = $len; - $z = 4; - } elsif (($cnt - $base) * 2 < 20) { - $x = ($cnt - $base) * 2; - $y = $len; - $z = 5; - } - - if ($z) { - print " TCP: missing data($x $y $z) $hl"; -# &dump(); - return; - } - - local($tcpat) = $base + $hl; - $hs = &dosum($_[2], $tcpat, $cnt); - if ($hs != 0) { - local($osum) = $bytes[$tcpat + 8]; - $bytes[$base + $hl + 8] = 0; - local($hs2) = &dosum($_[2], $tcpat, $cnt); - $bytes[$tcpat + 8] = $osum; - printf " TCP: (%x) %x != %x", $hs, $osum, $hs2; - } else { - print " TCP: ok ($x $y)"; - } -} - -sub udpcommon { - local($base) = $_[0]; - local($hl) = $_[1]; - local($hs) = $_[2]; - - if ($bytes[$base + 1] > ($cnt - $base) * 2) { - print " UDP: missing data(1)"; - return; - } elsif ($bytes[$base + 1] < ($hl << 1) + 8) { - print " UDP: missing data(2)"; - return; - } elsif (($cnt - $base) * 2 < ($hl << 1) + 8) { - print " UDP: missing data(3)"; - return; - } - - local($udpat) = $base + $hl; - $hs = &dosum($udpsum, $udpat, $cnt); - local($osum) = $bytes[$udpat + 3]; - - # - # It is valid for UDP packets to have a 0 checksum field. - # If it is 0, then display what it would otherwise be. - # - if ($osum == 0) { - printf " UDP: => %x", $hs; - } elsif ($hs != 0) { - $bytes[$udpat + 3] = 0; - local($hs2) = &dosum($udpsum, $udpat, $cnt); - $bytes[$udpat + 3] = $osum; - printf " UDP: (%x) %x != %x", $hs, $osum, $hs2; - } else { - print " UDP: ok"; - } -} - -sub ipv6check { - local($base) = $_[0]; - $hl = $bytes[$base] / 256; - return if (($hl >> 4) != 6); # IPv4 ? - $hl = 40; - - print " IPv6($base): ok "; - - if (($bytes[$base + 3] >> 8) == 6) { - &tcpcheck6($base); - } elsif (($bytes[$base + 3] >> 8) == 58) { - &icmpcheck6($base); - } - print "\n"; -} - -sub tcpcheck6 { - local($base) = $_[0]; - local($hl) = $bytes[$base] / 256; - return if (($hl >> 4) != 6); - $hl = 20; - - local($hs) = 6; # TCP - local($len) = $bytes[$base + 2]; - $hs += $len; - $hs += &ipv6addrsum($base); - - &tcpcommon($base, $hl, $hs, 2); -} - -sub icmpcheck6 { - local($base) = $_[0]; - local($hl) = 20; - - local($hs) = 58; # ICMP6 - local($len) = $bytes[$base + 2]; - $hs += $len; - $hs += &ipv6addrsum($base); - - local($len) = $bytes[$base + 1] - ($hl << 1); - - if ($bytes[$base + 2] > ($cnt - $base) * 2) { - print " ICMPv6: missing data(1)"; - return; - } elsif ($bytes[$base + 2] < 8) { - print " ICMPv6: missing data(2)"; - return; - } - - local($osum) = $bytes[$base + $hl + 1]; - $bytes[$base + $hl + 1] = 0; - local($hs2) = &dosum($hs, $base + $hl, $cnt); - $bytes[$base + $hl + 1] = $osum; - - if ($osum != $hs2) { - printf " ICMPv6: (%x) %x != %x", $hs, $osum, $hs2; - } else { - print " ICMPv6: ok"; - } -# if ($base == 0) { -# $type = $bytes[$hl] >> 8; -# if ($type == 3 || $type == 4 || $type == 5 || -# $type == 11 || $type == 12) { -# &ipv4check($hl + 4); -# } -# } -} - -sub ipv4check { - local($base) = $_[0]; - $hl = $bytes[$base] / 256; - if (($hl >> 4) == 6) { - &ipv6check($_[0]); - } - return if (($hl >> 4) != 4); # IPv4 ? - $hl &= 0xf; - $hl <<= 1; # get the header length in 16bit words - - $hs = &dosum(0, $base, $base + $hl); - $osum = $bytes[$base + 5]; - - if ($hs != 0) { - $bytes[$base + 5] = 0; - $hs2 = &dosum(0, $base, $base + $hl); - $bytes[$base + 5] = $osum; - printf " IPv4: ($hl,%x) %x != %x", $hs, $osum, $hs2; - } else { - print " IPv4($base): ok "; - } - - # - # Recognise TCP & UDP and calculate checksums for each of these. - # - if (($bytes[$base + 4] & 0xff) == 4) { - &ipv4check($hl); - } - if (($bytes[$base + 4] & 0xff) == 6) { - &tcpcheck($base); - } - - if (($bytes[$base + 4] & 0xff) == 17) { - &udpcheck($base); - } - - if (($bytes[$base + 4] & 0xff) == 1) { - &icmpcheck($base); - } - if ($base == 0) { - print "\n"; - } -} - -sub tcpcheck { - local($base) = $_[0]; - local($hl) = $bytes[$base] / 256; - return if (($hl >> 4) != 4); - if ($bytes[$base + 3] & 0x3fff) { - print " TCP: fragment"; - return; - } - $hl &= 0xf; - $hl <<= 1; - - local($hs) = 6; # TCP - local($len) = $bytes[$base + 1] - ($hl << 1); - $hs += $len; - $hs += &ipv4addrsum($base); - - &tcpcommon($base, $hl, $hs, 1); -} - -sub udpcheck { - local($base) = $_[0]; - local($hl) = $bytes[0] / 256; - return if (($hl >> 4) != 4); - if ($bytes[$base + 3] & 0x3fff) { - print " UDP: fragment"; - return; - } - $hl &= 0xf; - $hl <<= 1; - - local($hs) = 17; # UDP - local($len) = $bytes[$base + 1] - ($hl << 1); - $hs += $len; - $hs += &ipv4addrsum($base); - local($udpsum) = $hs; - &udpcommon($base, $hl, $hs); -} - -sub icmpcheck { - local($base) = $_[0]; - local($hl) = $bytes[$base + 0] / 256; - return if (($hl >> 4) != 4); - return if ($bytes[3] & 0x1fff); - $hl &= 0xf; - $hl <<= 1; - - local($hs); - local($hs2); - - local($len) = $bytes[$base + 1] - ($hl << 1); - - if ($bytes[$base + 1] > ($cnt - $base) * 2) { - print " ICMP: missing data(1)"; - return; - } elsif ($bytes[$base + 1] < ($hl << 1) + 8) { - print " ICMP: missing data(2)"; - return; - } elsif (($cnt - $base) * 2 < ($hl << 1) + 8) { - print " ICMP: missing data(3)"; - return; - } - - local($osum) = $bytes[$base + $hl + 1]; - $bytes[$base + $hl + 1] = 0; - $hs2 = &dosum(0, $base + $hl, $cnt); - $bytes[$base + $hl + 1] = $osum; - - if ($osum != $hs2) { - printf " ICMP: (%x) %x != %x", $hs, $osum, $hs2; - } else { - print " ICMP: ok"; - } - if ($base == 0) { - $type = $bytes[$hl] >> 8; - if ($type == 3 || $type == 4 || $type == 5 || - $type == 11 || $type == 12) { - &ipv4check($hl + 4); - } - } -} - -while ($#ARGV >= 0) { - open(I, "$ARGV[0]") || die $!; - print "--- $ARGV[0] ---\n"; - $multi = 0; - while (<I>) { - chop; - s/#.*//g; - - # - # If the first non-comment, non-empty line of input starts - # with a '[', then allow the input to be a multi-line hex - # string, otherwise it has to be all on one line. - # - if (/^\[/) { - $multi=1; - s/^\[[^]]*\]//g; - - } - s/^ *//g; - if (length == 0) { - next if ($cnt == 0); - &ipv4check(0); - $cnt = 0; - $multi = 0; - next; - } - - # - # look for 16 bits, represented with leading 0's as required, - # in hex. - # - s/\t/ /g; - while (/^[0-9a-fA-F][0-9a-fA-F] [0-9a-fA-F][0-9a-fA-F] .*/) { - s/^([0-9a-fA-F][0-9a-fA-F]) ([0-9a-fA-F][0-9a-fA-F]) (.*)/$1$2 $3/; - } - while (/.* [0-9a-fA-F][0-9a-fA-F] [0-9a-fA-F][0-9a-fA-F] .*/) { -$b=$_; - s/(.*?) ([0-9a-fA-F][0-9a-fA-F]) ([0-9a-fA-F][0-9a-fA-F]) (.*)/$1 $2$3 $4/g; - } - if (/.* [0-9a-fA-F][0-9a-fA-F] [0-9a-fA-F][0-9a-fA-F]/) { -$b=$_; - s/(.*?) ([0-9a-fA-F][0-9a-fA-F]) ([0-9a-fA-F][0-9a-fA-F])/$1 $2$3/g; - } - while (/^[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F].*/) { - $x = $_; - $x =~ s/([0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]).*/$1/; - $x =~ s/ *//g; - $y = hex $x; - s/[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F] *(.*)/$1/; - $bytes[$cnt] = $y; -#print "bytes[$cnt] = $x\n"; - $cnt++; - } - - # - # Pick up stragler bytes. - # - if (/^[0-9a-fA-F][0-9a-fA-F]/) { - $y = hex $_; - $bytes[$cnt++] = $y * 256; - } - if ($multi == 0 && $cnt > 0) { - &ipv4check(0); - $cnt = 0; - } - } - - if ($cnt > 0) { - &ipv4check(0); - } - close(I); - shift(@ARGV); -} |
