From 67c70b98e1c7039c835cdd1a85b5c94157b9dbf8 Mon Sep 17 00:00:00 2001 From: martti Date: Mon, 13 May 2002 06:35:47 +0000 Subject: [PATCH] ipf regression tests are in regress/sys/kern/ipf --- dist/ipf/test/Makefile | 74 -- dist/ipf/test/dotest | 30 - dist/ipf/test/expected/f1 | 20 - dist/ipf/test/expected/f10 | 126 --- dist/ipf/test/expected/f11 | 119 --- dist/ipf/test/expected/f12 | 60 -- dist/ipf/test/expected/f13 | 72 -- dist/ipf/test/expected/f14 | 48 - dist/ipf/test/expected/f15 | 9 - dist/ipf/test/expected/f16 | 9 - dist/ipf/test/expected/f17 | 10 - dist/ipf/test/expected/f2 | 42 - dist/ipf/test/expected/f3 | 48 - dist/ipf/test/expected/f4 | 48 - dist/ipf/test/expected/f5 | 1392 ---------------------------- dist/ipf/test/expected/f6 | 1392 ---------------------------- dist/ipf/test/expected/f7 | 60 -- dist/ipf/test/expected/f8 | 42 - dist/ipf/test/expected/f9 | 126 --- dist/ipf/test/expected/i1 | 13 - dist/ipf/test/expected/i10 | 4 - dist/ipf/test/expected/i11 | 4 - dist/ipf/test/expected/i2 | 6 - dist/ipf/test/expected/i3 | 10 - dist/ipf/test/expected/i4 | 7 - dist/ipf/test/expected/i5 | 5 - dist/ipf/test/expected/i6 | 4 - dist/ipf/test/expected/i7 | 4 - dist/ipf/test/expected/i8 | 2 - dist/ipf/test/expected/i9 | 5 - dist/ipf/test/expected/in1 | 24 - dist/ipf/test/expected/in2 | 22 - dist/ipf/test/expected/in3 | 5 - dist/ipf/test/expected/in4 | 5 - dist/ipf/test/expected/ipv6.1 | 5 - dist/ipf/test/expected/ipv6.2 | 17 - dist/ipf/test/expected/l1 | 49 - dist/ipf/test/expected/l1.b | 47 - dist/ipf/test/expected/n1 | 96 -- dist/ipf/test/expected/n2 | 80 -- dist/ipf/test/expected/n3 | 12 - dist/ipf/test/expected/n4 | 30 - dist/ipf/test/expected/n5 | 330 ------- dist/ipf/test/expected/n6 | 70 -- dist/ipf/test/expected/n7 | 20 - dist/ipf/test/expected/ni1 | 3 - dist/ipf/test/expected/ni2 | 10 - dist/ipf/test/expected/ni4 | 4 - dist/ipf/test/expected/ni5 | 47 - dist/ipf/test/hextest | 30 - dist/ipf/test/input/f1 | 4 - dist/ipf/test/input/f10 | 6 - dist/ipf/test/input/f11 | 16 - dist/ipf/test/input/f12 | 35 - dist/ipf/test/input/f13 | 43 - dist/ipf/test/input/f14 | 5 - dist/ipf/test/input/f15 | 8 - dist/ipf/test/input/f16 | 8 - dist/ipf/test/input/f17 | 61 -- dist/ipf/test/input/f2 | 6 - dist/ipf/test/input/f3 | 5 - dist/ipf/test/input/f4 | 5 - dist/ipf/test/input/f5 | 28 - dist/ipf/test/input/f6 | 28 - dist/ipf/test/input/f7 | 9 - dist/ipf/test/input/f8 | 6 - dist/ipf/test/input/f9 | 6 - dist/ipf/test/input/ipv6.2 | 28 - dist/ipf/test/input/l1 | 52 -- dist/ipf/test/input/n1 | 31 - dist/ipf/test/input/n2 | 19 - dist/ipf/test/input/n3 | 5 - dist/ipf/test/input/n4 | 5 - dist/ipf/test/input/n5 | 54 -- dist/ipf/test/input/n6 | 13 - dist/ipf/test/input/n7 | 9 - dist/ipf/test/input/ni1 | 6 - dist/ipf/test/input/ni2 | 161 ---- dist/ipf/test/input/ni4 | 10 - dist/ipf/test/input/ni5 | 276 ------ dist/ipf/test/intest | 21 - dist/ipf/test/itest | 24 - dist/ipf/test/logtest | 48 - dist/ipf/test/mhtest | 36 - dist/ipf/test/mtest | 36 - dist/ipf/test/natipftest | 28 - dist/ipf/test/nattest | 30 - dist/ipf/test/regress/f1 | 4 - dist/ipf/test/regress/f10 | 18 - dist/ipf/test/regress/f11 | 7 - dist/ipf/test/regress/f12 | 6 - dist/ipf/test/regress/f13 | 6 - dist/ipf/test/regress/f14 | 8 - dist/ipf/test/regress/f15 | 8 - dist/ipf/test/regress/f16 | 10 - dist/ipf/test/regress/f17 | 4 - dist/ipf/test/regress/f2 | 6 - dist/ipf/test/regress/f3 | 8 - dist/ipf/test/regress/f4 | 8 - dist/ipf/test/regress/f5 | 48 - dist/ipf/test/regress/f6 | 48 - dist/ipf/test/regress/f7 | 6 - dist/ipf/test/regress/f8 | 6 - dist/ipf/test/regress/f9 | 18 - dist/ipf/test/regress/i1 | 13 - dist/ipf/test/regress/i10 | 4 - dist/ipf/test/regress/i11 | 4 - dist/ipf/test/regress/i2 | 6 - dist/ipf/test/regress/i3 | 10 - dist/ipf/test/regress/i4 | 7 - dist/ipf/test/regress/i5 | 5 - dist/ipf/test/regress/i6 | 4 - dist/ipf/test/regress/i7 | 4 - dist/ipf/test/regress/i8 | 2 - dist/ipf/test/regress/i9 | 5 - dist/ipf/test/regress/in1 | 24 - dist/ipf/test/regress/in2 | 22 - dist/ipf/test/regress/in3 | 5 - dist/ipf/test/regress/in4 | 5 - dist/ipf/test/regress/ipv6.2 | 5 - dist/ipf/test/regress/l1 | 6 - dist/ipf/test/regress/n1 | 3 - dist/ipf/test/regress/n2 | 4 - dist/ipf/test/regress/n3 | 2 - dist/ipf/test/regress/n4 | 5 - dist/ipf/test/regress/n5 | 6 - dist/ipf/test/regress/n6 | 5 - dist/ipf/test/regress/n7 | 2 - dist/ipf/test/regress/ni1.ipf | 4 - dist/ipf/test/regress/ni1.nat | 1 - dist/ipf/test/regress/ni2.ipf | 1 - dist/ipf/test/regress/ni2.nat | 1 - dist/ipf/test/regress/ni4.ipf | 4 - dist/ipf/test/regress/ni4.nat | 1 - dist/ipf/test/regress/ni5.ipf | 3 - dist/ipf/test/regress/ni5.nat | 1 - usr.sbin/ipf/ipftest/Makefile | 4 +- usr.sbin/ipf/ipftest/test/Makefile | 43 - usr.sbin/ipf/ipftest/test/dotest | 22 - usr.sbin/ipf/ipftest/test/hextest | 22 - usr.sbin/ipf/ipftest/test/itest | 16 - usr.sbin/ipf/ipftest/test/nattest | 22 - 142 files changed, 1 insertion(+), 6389 deletions(-) delete mode 100644 dist/ipf/test/Makefile delete mode 100644 dist/ipf/test/dotest delete mode 100644 dist/ipf/test/expected/f1 delete mode 100644 dist/ipf/test/expected/f10 delete mode 100644 dist/ipf/test/expected/f11 delete mode 100644 dist/ipf/test/expected/f12 delete mode 100644 dist/ipf/test/expected/f13 delete mode 100644 dist/ipf/test/expected/f14 delete mode 100644 dist/ipf/test/expected/f15 delete mode 100644 dist/ipf/test/expected/f16 delete mode 100644 dist/ipf/test/expected/f17 delete mode 100644 dist/ipf/test/expected/f2 delete mode 100644 dist/ipf/test/expected/f3 delete mode 100644 dist/ipf/test/expected/f4 delete mode 100644 dist/ipf/test/expected/f5 delete mode 100644 dist/ipf/test/expected/f6 delete mode 100644 dist/ipf/test/expected/f7 delete mode 100644 dist/ipf/test/expected/f8 delete mode 100644 dist/ipf/test/expected/f9 delete mode 100644 dist/ipf/test/expected/i1 delete mode 100644 dist/ipf/test/expected/i10 delete mode 100644 dist/ipf/test/expected/i11 delete mode 100644 dist/ipf/test/expected/i2 delete mode 100644 dist/ipf/test/expected/i3 delete mode 100644 dist/ipf/test/expected/i4 delete mode 100644 dist/ipf/test/expected/i5 delete mode 100644 dist/ipf/test/expected/i6 delete mode 100644 dist/ipf/test/expected/i7 delete mode 100644 dist/ipf/test/expected/i8 delete mode 100644 dist/ipf/test/expected/i9 delete mode 100644 dist/ipf/test/expected/in1 delete mode 100644 dist/ipf/test/expected/in2 delete mode 100644 dist/ipf/test/expected/in3 delete mode 100644 dist/ipf/test/expected/in4 delete mode 100644 dist/ipf/test/expected/ipv6.1 delete mode 100644 dist/ipf/test/expected/ipv6.2 delete mode 100644 dist/ipf/test/expected/l1 delete mode 100644 dist/ipf/test/expected/l1.b delete mode 100644 dist/ipf/test/expected/n1 delete mode 100644 dist/ipf/test/expected/n2 delete mode 100644 dist/ipf/test/expected/n3 delete mode 100644 dist/ipf/test/expected/n4 delete mode 100644 dist/ipf/test/expected/n5 delete mode 100644 dist/ipf/test/expected/n6 delete mode 100644 dist/ipf/test/expected/n7 delete mode 100644 dist/ipf/test/expected/ni1 delete mode 100644 dist/ipf/test/expected/ni2 delete mode 100644 dist/ipf/test/expected/ni4 delete mode 100644 dist/ipf/test/expected/ni5 delete mode 100644 dist/ipf/test/hextest delete mode 100644 dist/ipf/test/input/f1 delete mode 100644 dist/ipf/test/input/f10 delete mode 100644 dist/ipf/test/input/f11 delete mode 100644 dist/ipf/test/input/f12 delete mode 100644 dist/ipf/test/input/f13 delete mode 100644 dist/ipf/test/input/f14 delete mode 100644 dist/ipf/test/input/f15 delete mode 100644 dist/ipf/test/input/f16 delete mode 100644 dist/ipf/test/input/f17 delete mode 100644 dist/ipf/test/input/f2 delete mode 100644 dist/ipf/test/input/f3 delete mode 100644 dist/ipf/test/input/f4 delete mode 100644 dist/ipf/test/input/f5 delete mode 100644 dist/ipf/test/input/f6 delete mode 100644 dist/ipf/test/input/f7 delete mode 100644 dist/ipf/test/input/f8 delete mode 100644 dist/ipf/test/input/f9 delete mode 100644 dist/ipf/test/input/ipv6.2 delete mode 100644 dist/ipf/test/input/l1 delete mode 100644 dist/ipf/test/input/n1 delete mode 100644 dist/ipf/test/input/n2 delete mode 100644 dist/ipf/test/input/n3 delete mode 100644 dist/ipf/test/input/n4 delete mode 100644 dist/ipf/test/input/n5 delete mode 100644 dist/ipf/test/input/n6 delete mode 100644 dist/ipf/test/input/n7 delete mode 100644 dist/ipf/test/input/ni1 delete mode 100644 dist/ipf/test/input/ni2 delete mode 100644 dist/ipf/test/input/ni4 delete mode 100644 dist/ipf/test/input/ni5 delete mode 100644 dist/ipf/test/intest delete mode 100644 dist/ipf/test/itest delete mode 100644 dist/ipf/test/logtest delete mode 100644 dist/ipf/test/mhtest delete mode 100644 dist/ipf/test/mtest delete mode 100644 dist/ipf/test/natipftest delete mode 100644 dist/ipf/test/nattest delete mode 100644 dist/ipf/test/regress/f1 delete mode 100644 dist/ipf/test/regress/f10 delete mode 100644 dist/ipf/test/regress/f11 delete mode 100644 dist/ipf/test/regress/f12 delete mode 100644 dist/ipf/test/regress/f13 delete mode 100644 dist/ipf/test/regress/f14 delete mode 100644 dist/ipf/test/regress/f15 delete mode 100644 dist/ipf/test/regress/f16 delete mode 100644 dist/ipf/test/regress/f17 delete mode 100644 dist/ipf/test/regress/f2 delete mode 100644 dist/ipf/test/regress/f3 delete mode 100644 dist/ipf/test/regress/f4 delete mode 100644 dist/ipf/test/regress/f5 delete mode 100644 dist/ipf/test/regress/f6 delete mode 100644 dist/ipf/test/regress/f7 delete mode 100644 dist/ipf/test/regress/f8 delete mode 100644 dist/ipf/test/regress/f9 delete mode 100644 dist/ipf/test/regress/i1 delete mode 100644 dist/ipf/test/regress/i10 delete mode 100644 dist/ipf/test/regress/i11 delete mode 100644 dist/ipf/test/regress/i2 delete mode 100644 dist/ipf/test/regress/i3 delete mode 100644 dist/ipf/test/regress/i4 delete mode 100644 dist/ipf/test/regress/i5 delete mode 100644 dist/ipf/test/regress/i6 delete mode 100644 dist/ipf/test/regress/i7 delete mode 100644 dist/ipf/test/regress/i8 delete mode 100644 dist/ipf/test/regress/i9 delete mode 100644 dist/ipf/test/regress/in1 delete mode 100644 dist/ipf/test/regress/in2 delete mode 100644 dist/ipf/test/regress/in3 delete mode 100644 dist/ipf/test/regress/in4 delete mode 100644 dist/ipf/test/regress/ipv6.2 delete mode 100644 dist/ipf/test/regress/l1 delete mode 100644 dist/ipf/test/regress/n1 delete mode 100644 dist/ipf/test/regress/n2 delete mode 100644 dist/ipf/test/regress/n3 delete mode 100644 dist/ipf/test/regress/n4 delete mode 100644 dist/ipf/test/regress/n5 delete mode 100644 dist/ipf/test/regress/n6 delete mode 100644 dist/ipf/test/regress/n7 delete mode 100644 dist/ipf/test/regress/ni1.ipf delete mode 100644 dist/ipf/test/regress/ni1.nat delete mode 100644 dist/ipf/test/regress/ni2.ipf delete mode 100644 dist/ipf/test/regress/ni2.nat delete mode 100644 dist/ipf/test/regress/ni4.ipf delete mode 100644 dist/ipf/test/regress/ni4.nat delete mode 100644 dist/ipf/test/regress/ni5.ipf delete mode 100644 dist/ipf/test/regress/ni5.nat delete mode 100644 usr.sbin/ipf/ipftest/test/Makefile delete mode 100644 usr.sbin/ipf/ipftest/test/dotest delete mode 100644 usr.sbin/ipf/ipftest/test/hextest delete mode 100644 usr.sbin/ipf/ipftest/test/itest delete mode 100644 usr.sbin/ipf/ipftest/test/nattest diff --git a/dist/ipf/test/Makefile b/dist/ipf/test/Makefile deleted file mode 100644 index 2c4acd817cf5..000000000000 --- a/dist/ipf/test/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# -# (C)opyright 1993-1996 by Darren Reed. -# -# Redistribution and use in source and binary forms are permitted -# provided that this notice is preserved and due credit is given -# to the original author and the contributors. -# -BINDEST=/usr/local/bin -SBINDEST=/sbin -MANDIR=/usr/share/man - -tests: first 0 ftests ptests ntests nitests logtests ipv6 intests - -first: - -mkdir -p results - -# Filtering tests -ftests: f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f15 f16 f17 - -# Rule parsing tests -ptests: i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 - -ntests: n1 n2 n3 n4 n5 n6 n7 - -nitests: ni1 ni2 ni3 ni4 ni5 - -intests: in1 in2 in3 in4 - -logtests: l1 - -ipv6: ipv6.1 ipv6.2 - -0: - @(cd ..; make ipftest; ) - -f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f14: - @/bin/sh ./dotest $@ - -f12 f13: - @/bin/sh ./hextest $@ - -f15 f16: - @/bin/sh ./mtest $@ - -f17: - @/bin/sh ./mhtest $@ - -i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11: - @/bin/sh ./itest $@ - -n1 n2 n3 n4 n5 n6 n7: - @/bin/sh ./nattest $@ - -ni1 ni2 ni3 ni4 ni5: - @/bin/sh ./natipftest $@ - -in1 in2 in3 in4: - @/bin/sh ./intest $@ - -l1: - @/bin/sh ./logtest $@ - -ipv6.1 ipv6.2: - @/bin/sh ./dotest6 $@ - -clean: - /bin/rm -f f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f13 f12 f14 f15 f16 f17 - /bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 - /bin/rm -f n1 n2 n3 n4 n5 n6 n7 - /bin/rm -f ni1 ni2 ni3 ni4 ni5 - /bin/rm -f in1 in2 in3 in4 - /bin/rm -f l1 - /bin/rm -f ipv6.1 ipv6.2 - /bin/rm -f results/* diff --git a/dist/ipf/test/dotest b/dist/ipf/test/dotest deleted file mode 100644 index cff0b4979cbc..000000000000 --- a/dist/ipf/test/dotest +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# $NetBSD: dotest,v 1.2 1999/12/11 23:22:14 veego Exp $ -# -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 -( while read rule; do - echo "$rule" | ../ipftest -br - -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/dist/ipf/test/expected/f1 b/dist/ipf/test/expected/f1 deleted file mode 100644 index 86d9592073e2..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f10 b/dist/ipf/test/expected/f10 deleted file mode 100644 index da6c312f6ee3..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f11 b/dist/ipf/test/expected/f11 deleted file mode 100644 index b977e41604ee..000000000000 --- a/dist/ipf/test/expected/f11 +++ /dev/null @@ -1,119 +0,0 @@ -pass -nomatch -nomatch -pass -pass -nomatch -pass -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -nomatch -nomatch -block -block -nomatch -block -nomatch -block -nomatch -nomatch -nomatch -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 -block -block -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 -nomatch -nomatch -block -block -block -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/dist/ipf/test/expected/f12 b/dist/ipf/test/expected/f12 deleted file mode 100644 index 88354d95030d..000000000000 --- a/dist/ipf/test/expected/f12 +++ /dev/null @@ -1,60 +0,0 @@ -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -block -block -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block --------- diff --git a/dist/ipf/test/expected/f13 b/dist/ipf/test/expected/f13 deleted file mode 100644 index a2a950a9baba..000000000000 --- a/dist/ipf/test/expected/f13 +++ /dev/null @@ -1,72 +0,0 @@ -pass -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 -nomatch -nomatch -nomatch -pass -pass -nomatch -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -nomatch -block --------- -pass -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/dist/ipf/test/expected/f14 b/dist/ipf/test/expected/f14 deleted file mode 100644 index 1c6ed5cb6613..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f15 b/dist/ipf/test/expected/f15 deleted file mode 100644 index 9b31258e5717..000000000000 --- a/dist/ipf/test/expected/f15 +++ /dev/null @@ -1,9 +0,0 @@ -block return-rst -pass -block return-icmp -pass -block -nomatch -pass -pass --------- diff --git a/dist/ipf/test/expected/f16 b/dist/ipf/test/expected/f16 deleted file mode 100644 index b6cb3fae0818..000000000000 --- a/dist/ipf/test/expected/f16 +++ /dev/null @@ -1,9 +0,0 @@ -block -block -pass -block -pass -pass -block -block --------- diff --git a/dist/ipf/test/expected/f17 b/dist/ipf/test/expected/f17 deleted file mode 100644 index 99eee84d78fb..000000000000 --- a/dist/ipf/test/expected/f17 +++ /dev/null @@ -1,10 +0,0 @@ -pass -block return-rst -pass -pass -pass -pass -pass -pass -pass --------- diff --git a/dist/ipf/test/expected/f2 b/dist/ipf/test/expected/f2 deleted file mode 100644 index 7093a41026bc..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f3 b/dist/ipf/test/expected/f3 deleted file mode 100644 index 5df3ac4491e6..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f4 b/dist/ipf/test/expected/f4 deleted file mode 100644 index 5df3ac4491e6..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f5 b/dist/ipf/test/expected/f5 deleted file mode 100644 index 36c7d404ef61..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f6 b/dist/ipf/test/expected/f6 deleted file mode 100644 index 36c7d404ef61..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f7 b/dist/ipf/test/expected/f7 deleted file mode 100644 index 6aa7951f3e6b..000000000000 --- a/dist/ipf/test/expected/f7 +++ /dev/null @@ -1,60 +0,0 @@ -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -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 -nomatch -nomatch -nomatch -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass --------- diff --git a/dist/ipf/test/expected/f8 b/dist/ipf/test/expected/f8 deleted file mode 100644 index ad42ff2cc7c4..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/f9 b/dist/ipf/test/expected/f9 deleted file mode 100644 index 709744d62871..000000000000 --- a/dist/ipf/test/expected/f9 +++ /dev/null @@ -1,126 +0,0 @@ -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -pass -pass -nomatch --------- -nomatch -nomatch -nomatch -nomatch -block -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 -block -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass --------- -block -block -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 -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -block -block -nomatch --------- diff --git a/dist/ipf/test/expected/i1 b/dist/ipf/test/expected/i1 deleted file mode 100644 index 3eb14be74356..000000000000 --- a/dist/ipf/test/expected/i1 +++ /dev/null @@ -1,13 +0,0 @@ -pass in from any to any -block out from any to any -log in from any to any -log body in from any to any -count in from any to any -pass in from !any to any -block in from any to !any -pass in on ed0(!) 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 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 diff --git a/dist/ipf/test/expected/i10 b/dist/ipf/test/expected/i10 deleted file mode 100644 index 57bd4ef6867f..000000000000 --- a/dist/ipf/test/expected/i10 +++ /dev/null @@ -1,4 +0,0 @@ -pass in from 127.0.0.1/32 to 127.0.0.1/32 with 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/dist/ipf/test/expected/i11 b/dist/ipf/test/expected/i11 deleted file mode 100644 index 9268c66a5abc..000000000000 --- a/dist/ipf/test/expected/i11 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on ed0(!) proto tcp from 127.0.0.1/32 to 127.0.0.1/32 port = 23 keep state -block in log first on lo0(!) proto tcp/udp from any to any keep state -pass in proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 2049 keep frags -pass in proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 53 keep state keep frags diff --git a/dist/ipf/test/expected/i2 b/dist/ipf/test/expected/i2 deleted file mode 100644 index 9d3398d3e11f..000000000000 --- a/dist/ipf/test/expected/i2 +++ /dev/null @@ -1,6 +0,0 @@ -log in proto tcp from any to any -pass in proto tcp from any to any -pass in proto udp from 127.0.0.1/32 to 127.0.0.1/32 -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 diff --git a/dist/ipf/test/expected/i3 b/dist/ipf/test/expected/i3 deleted file mode 100644 index 18d91614f0a6..000000000000 --- a/dist/ipf/test/expected/i3 +++ /dev/null @@ -1,10 +0,0 @@ -log in from any to any -pass in from 128.0.0.0/24 to 128.0.0.0/16 -pass in from 128.0.0.0/24 to 128.0.0.0/16 -pass in from 128.0.0.0/24 to 128.0.0.0/16 -pass in from 128.0.0.0/24 to 128.0.0.0/16 -pass in from 128.0.0.0/24 to 128.0.0.0/16 -pass in from 127.0.0.1/32 to 127.0.0.1/32 -block in log from any to any -block in log level auth.info on hme0(!) from any to any -log level local5.warn out from any to any diff --git a/dist/ipf/test/expected/i4 b/dist/ipf/test/expected/i4 deleted file mode 100644 index dfa3674db2a6..000000000000 --- a/dist/ipf/test/expected/i4 +++ /dev/null @@ -1,7 +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 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 < 123 -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 diff --git a/dist/ipf/test/expected/i5 b/dist/ipf/test/expected/i5 deleted file mode 100644 index 3bcb10bf205e..000000000000 --- a/dist/ipf/test/expected/i5 +++ /dev/null @@ -1,5 +0,0 @@ -log in from any to any -count in tos 0x80 from any to any -pass in on ed0(!) 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 diff --git a/dist/ipf/test/expected/i6 b/dist/ipf/test/expected/i6 deleted file mode 100644 index 4849626fdcf0..000000000000 --- a/dist/ipf/test/expected/i6 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on lo0(!) fastroute from any to any -pass in on lo0(!) dup-to qe0(!) from 127.0.0.1/32 to 127.0.0.1/32 -pass in on qe0(!) dup-to qe0(!):127.0.0.1 from 127.0.0.1/32 to 127.0.0.1/32 -block in quick on qe0(!) to qe1(!) from any to any diff --git a/dist/ipf/test/expected/i7 b/dist/ipf/test/expected/i7 deleted file mode 100644 index db9cd0120bcb..000000000000 --- a/dist/ipf/test/expected/i7 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on ed0(!) 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/FSRPAUC -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 diff --git a/dist/ipf/test/expected/i8 b/dist/ipf/test/expected/i8 deleted file mode 100644 index 77dc1775763e..000000000000 --- a/dist/ipf/test/expected/i8 +++ /dev/null @@ -1,2 +0,0 @@ -pass in proto icmp from 127.0.0.1/32 to 127.0.0.1/32 icmp-type timest -block in proto icmp from any to any icmp-type unreach code 1 diff --git a/dist/ipf/test/expected/i9 b/dist/ipf/test/expected/i9 deleted file mode 100644 index b36d864a6e5e..000000000000 --- a/dist/ipf/test/expected/i9 +++ /dev/null @@ -1,5 +0,0 @@ -pass in from 127.0.0.1/32 to 127.0.0.1/32 with short -block in from any to any with ipopt -pass in from any to any with opt nop,rr,zsu -pass in from any to any with opt nop,rr,zsu not opt lsrr,ssrr -pass in from 127.0.0.1/32 to 127.0.0.1/32 with not frag diff --git a/dist/ipf/test/expected/in1 b/dist/ipf/test/expected/in1 deleted file mode 100644 index f3d0777943c0..000000000000 --- a/dist/ipf/test/expected/in1 +++ /dev/null @@ -1,24 +0,0 @@ -map le0 0.0.0.0/0 -> 0.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.0.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 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 portmap tcp 10000:19999 -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 portmap udp 20000:29999 -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 portmap tcp/udp 30000:39999 -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 portmap auto -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 portmap auto -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 portmap auto -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 proxy port ftp ftp/tcp -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 proxy port 1010 ftp/tcp -map le0 0.0.0.0/0 -> 0.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.0.0.0/32 portmap tcp 10000:19999 frag -map ppp0 192.168.0.0/16 -> 0.0.0.0/32 proxy port ftp ftp/tcp frag -map le0 0.0.0.0/0 -> 0.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.0.0.0/32 portmap tcp 10000:19999 age 30/30 -map le0 0.0.0.0/0 -> 0.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.0.0.0/32 portmap tcp 10000:19999 frag age 30/30 diff --git a/dist/ipf/test/expected/in2 b/dist/ipf/test/expected/in2 deleted file mode 100644 index ebe747b13a36..000000000000 --- a/dist/ipf/test/expected/in2 +++ /dev/null @@ -1,22 +0,0 @@ -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 tcp -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 ip -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1 port 80 tcp -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 ip -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1 port 80 tcp -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1 port 80 udp -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1 port 80 tcp/udp -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 icmp -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 ip frag -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 icmp frag -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin frag -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 ip frag age 10/10 -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 -rdr le0 0.0.0.0/0 port 0 -> 1.1.1.1 port 0 icmp frag age 10/10 -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30/30 -rdr le0 0.0.0.0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 diff --git a/dist/ipf/test/expected/in3 b/dist/ipf/test/expected/in3 deleted file mode 100644 index b8a85bf9f380..000000000000 --- a/dist/ipf/test/expected/in3 +++ /dev/null @@ -1,5 +0,0 @@ -bimap le0 0.0.0.0/0 -> 0.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.0.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/dist/ipf/test/expected/in4 b/dist/ipf/test/expected/in4 deleted file mode 100644 index ac8dce1bac8e..000000000000 --- a/dist/ipf/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/dist/ipf/test/expected/ipv6.1 b/dist/ipf/test/expected/ipv6.1 deleted file mode 100644 index 789646b79e82..000000000000 --- a/dist/ipf/test/expected/ipv6.1 +++ /dev/null @@ -1,5 +0,0 @@ -.\" $NetBSD: ipv6.1,v 1.1.1.1 2002/05/02 16:58:52 martti Exp $ -.\" -pass -pass --------- diff --git a/dist/ipf/test/expected/ipv6.2 b/dist/ipf/test/expected/ipv6.2 deleted file mode 100644 index 5600d5eba7e3..000000000000 --- a/dist/ipf/test/expected/ipv6.2 +++ /dev/null @@ -1,17 +0,0 @@ -.\" $NetBSD: ipv6.2,v 1.1.1.1 2002/05/02 16:58:52 martti Exp $ -.\" -nomatch -block -nomatch -block --------- -block -nomatch -block -nomatch --------- -pass -pass -pass -pass --------- diff --git a/dist/ipf/test/expected/l1 b/dist/ipf/test/expected/l1 deleted file mode 100644 index dbd6b012e4b5..000000000000 --- a/dist/ipf/test/expected/l1 +++ /dev/null @@ -1,49 +0,0 @@ -log in all -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 -F 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 2x 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 -> 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 -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 2x 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 -> 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 -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 -F K-S IN --------- -pass in log first quick proto tcp from 1.1.1.1 to any flags S keep state -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 @-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 -F 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/dist/ipf/test/expected/l1.b b/dist/ipf/test/expected/l1.b deleted file mode 100644 index e5c107759930..000000000000 --- a/dist/ipf/test/expected/l1.b +++ /dev/null @@ -1,47 +0,0 @@ -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 -F 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 2x 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 -> 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 --------- --------- --------- -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 2x 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 -> 4.4.4.4 PR ip len 20 (20) 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 -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 -F 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 -S K-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 -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 -F 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/dist/ipf/test/expected/n1 b/dist/ipf/test/expected/n1 deleted file mode 100644 index c195f6f79263..000000000000 --- a/dist/ipf/test/expected/n1 +++ /dev/null @@ -1,96 +0,0 @@ -ip 20(20) 255 10.1.1.0 > 10.1.1.2 -ip 20(20) 255 10.2.2.2 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.3.4.5 -ip 20(20) 255 10.1.1.2 > 10.3.4.5 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -ip 48(20) 1 10.2.2.2 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.1.1.1 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.1.1.2 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.1.1.2 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.1.1.3 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.1.1.3 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -------------------------------- -ip 20(20) 255 10.3.4.5 > 10.1.1.2 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.3.4.5 > 10.1.1.1 -ip 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.2.2.2 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.0 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 48(20) 1 10.3.4.5 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.2.2.2 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.1.1.1 -ip 20(20) 34 10.3.4.5 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.3.4.5 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.1.1.2 -ip 20(20) 34 10.1.1.3 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.3.4.5 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -------------------------------- -ip 20(20) 255 10.3.4.1 > 10.1.1.2 -ip 20(20) 255 10.3.4.2 > 10.1.1.2 -ip 20(20) 255 10.3.4.3 > 10.1.1.1 -ip 40(20) 6 10.3.4.3,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.3,1026 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.2.2.2 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.3.4.5 -ip 20(20) 255 10.1.1.2 > 10.3.4.5 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -ip 48(20) 1 10.3.4.2 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.2.2.2 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.3.4.3 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.3.4.3 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.3.4.4 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.3.4.4 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -------------------------------- diff --git a/dist/ipf/test/expected/n2 b/dist/ipf/test/expected/n2 deleted file mode 100644 index dc70138398d3..000000000000 --- a/dist/ipf/test/expected/n2 +++ /dev/null @@ -1,80 +0,0 @@ -ip 40(20) 6 10.2.2.2,10000 > 10.1.1.1,1025 -ip 40(20) 6 10.2.2.2,10001 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.1.1.1 > 10.1.2.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -ip 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -ip 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -ip 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.1.1.1 > 10.1.2.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 28(20) 17 10.3.4.5,10000 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -ip 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -ip 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -ip 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- -ip 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10001 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.1.1.1 > 10.1.2.1 -ip 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10003 > 10.1.1.1,1025 -ip 28(20) 17 10.3.4.1,10004 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10005 > 10.1.2.1,80 -ip 40(20) 6 10.3.4.1,10006 > 10.1.3.1,80 -ip 40(20) 6 10.3.4.1,10007 > 10.1.4.1,80 -ip 40(20) 6 10.3.4.1,10008 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- -ip 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,40001 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.1.1.1 > 10.1.2.1 -ip 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 28(20) 17 10.3.4.5,40000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,40001 > 10.1.2.1,80 -ip 40(20) 6 10.3.4.5,40000 > 10.1.3.1,80 -ip 40(20) 6 10.3.4.5,40001 > 10.1.4.1,80 -ip 40(20) 6 10.3.4.5,40000 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.1.1.3,2000 -------------------------------- diff --git a/dist/ipf/test/expected/n3 b/dist/ipf/test/expected/n3 deleted file mode 100644 index 03c071797106..000000000000 --- a/dist/ipf/test/expected/n3 +++ /dev/null @@ -1,12 +0,0 @@ -ip 40(20) 6 192.168.2.1,1488 > 203.1.1.1,80 -ip 40(20) 6 192.168.2.1,1276 > 203.1.1.1,80 -ip 40(20) 6 192.168.2.1,1032 > 203.1.1.1,80 -ip 28(20) 17 192.168.2.1,1032 > 203.1.1.1,80 -ip 40(20) 6 192.168.2.1,65299 > 203.1.1.1,80 -------------------------------- -ip 40(20) 6 192.168.1.1,1488 > 203.1.1.1,80 -ip 40(20) 6 192.168.1.1,1276 > 203.1.1.1,80 -ip 40(20) 6 192.168.1.0,1032 > 203.1.1.1,80 -ip 28(20) 17 192.168.1.0,1032 > 203.1.1.1,80 -ip 40(20) 6 192.168.1.255,65299 > 203.1.1.1,80 -------------------------------- diff --git a/dist/ipf/test/expected/n4 b/dist/ipf/test/expected/n4 deleted file mode 100644 index c6fb4d4e42f5..000000000000 --- a/dist/ipf/test/expected/n4 +++ /dev/null @@ -1,30 +0,0 @@ -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -ip 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -ip 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -ip 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -ip 28(20) 17 10.3.3.3,12345 > 10.2.2.1,10053 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,23 -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -ip 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,53 -------------------------------- diff --git a/dist/ipf/test/expected/n5 b/dist/ipf/test/expected/n5 deleted file mode 100644 index 75f174b0741c..000000000000 --- a/dist/ipf/test/expected/n5 +++ /dev/null @@ -1,330 +0,0 @@ -ip 20(20) 255 10.1.1.0 > 10.1.1.2 -ip 20(20) 255 10.2.2.2 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.3.4.5 -ip 20(20) 255 10.1.1.2 > 10.3.4.5 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -ip 48(20) 1 10.2.2.2 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.1.1.1 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.1.1.2 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.1.1.2 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.1.1.3 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.1.1.3 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -ip 40(20) 6 10.2.2.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.2.2.2,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.2.2.2 > 10.1.2.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -ip 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -ip 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -ip 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.2.2.2,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.2.2.2,1025 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- -ip 20(20) 255 10.3.4.5 > 10.1.1.2 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.3.4.5 > 10.1.1.1 -ip 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.2.2.2 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.0 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 48(20) 1 10.1.1.1 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.2.2.2 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.1.1.2 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.1.1.2 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.1.1.3 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.1.1.3 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.3.4.5 > 10.1.1.2 -ip 20(20) 0 10.3.4.5 > 10.1.2.1 -ip 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -ip 28(20) 17 10.3.4.5,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,2000 > 10.1.2.1,80 -ip 40(20) 6 10.3.4.5,2001 > 10.1.3.1,80 -ip 40(20) 6 10.3.4.5,2002 > 10.1.4.1,80 -ip 40(20) 6 10.3.4.5,2003 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- -ip 20(20) 255 10.1.1.0 > 10.1.1.2 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.2.2.2 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.3.4.5 -ip 20(20) 255 10.1.1.2 > 10.3.4.5 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -ip 48(20) 1 10.3.4.1 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.2.2.2 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.3.4.1 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.3.4.1 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.3.4.2 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.3.4.2 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.1.1.1 > 10.1.2.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -ip 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -ip 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -ip 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.3.4.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.3.4.1,1025 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 28(20) 17 10.3.4.1,1025 > 10.3.4.5,40001 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- -ip 20(20) 255 10.1.1.0 > 10.1.1.2 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.2.2.2 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.3.4.5 -ip 20(20) 255 10.1.1.2 > 10.3.4.5 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -ip 48(20) 1 10.1.1.1 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.2.2.2 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.1.1.2 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.1.1.2 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.1.1.3 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.1.1.3 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.1.1.1 > 10.1.2.1 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -ip 28(20) 17 10.3.4.5,10000 > 10.1.1.1,1025 -ip 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -ip 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -ip 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -ip 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 28(20) 17 10.3.4.5,10001 > 10.3.4.5,40001 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- -ip 20(20) 255 10.1.1.0 > 10.1.1.2 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10001 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.2.2.2 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.3.4.5 -ip 20(20) 255 10.1.1.2 > 10.3.4.5 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -ip 48(20) 1 10.1.1.1 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.2.2.2 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.1.1.2 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.1.1.2 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.1.1.3 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.1.1.3 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -ip 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10003 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.1.1.1 > 10.1.2.1 -ip 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10001 > 10.1.1.1,1025 -ip 28(20) 17 10.3.4.1,10004 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.1,10005 > 10.1.2.1,80 -ip 40(20) 6 10.3.4.1,10006 > 10.1.3.1,80 -ip 40(20) 6 10.3.4.1,10007 > 10.1.4.1,80 -ip 40(20) 6 10.3.4.1,10008 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.3.4.1,10009 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.3.4.1,10010 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -ip 28(20) 17 10.3.4.1,10011 > 10.3.4.5,40001 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.3.4.1,10012 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- -ip 20(20) 255 10.1.1.0 > 10.1.1.2 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -ip 20(20) 255 10.2.2.1 > 10.1.2.1 -ip 20(20) 255 10.2.2.2 > 10.1.2.1 -ip 20(20) 255 10.1.1.1 > 10.1.1.2 -ip 20(20) 255 10.1.1.2 > 10.1.1.1 -ip 20(20) 255 10.2.2.1 > 10.2.1.1 -ip 20(20) 255 10.2.2.2 > 10.2.1.1 -ip 20(20) 255 10.2.2.3 > 10.1.1.1 -ip 20(20) 255 10.2.3.4 > 10.2.2.2 -ip 20(20) 255 10.1.1.1 > 10.2.2.2 -ip 20(20) 255 10.1.1.2 > 10.2.2.2 -ip 20(20) 255 10.1.1.0 > 10.3.4.5 -ip 20(20) 255 10.1.1.1 > 10.3.4.5 -ip 20(20) 255 10.1.1.2 > 10.3.4.5 -ip 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -ip 48(20) 1 10.1.1.1 > 10.4.3.2 -ip 48(20) 1 10.4.3.2 > 10.2.2.2 -ip 48(20) 1 10.4.3.2 > 10.3.4.3 -ip 48(20) 1 10.4.3.2 > 10.3.4.5 -ip 20(20) 34 10.1.1.2 > 10.4.3.2 -ip 20(20) 34 10.4.3.2 > 10.3.4.4 -ip 20(20) 34 10.1.1.2 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.5 -ip 20(20) 34 10.1.1.3 > 10.4.3.4 -ip 20(20) 34 10.4.3.4 > 10.3.4.6 -ip 20(20) 35 10.1.1.3 > 10.4.3.4 -ip 20(20) 35 10.4.3.4 > 10.3.4.7 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,40000 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.0 > 10.1.1.2 -ip 20(20) 0 10.1.1.1 > 10.1.2.1 -ip 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -ip 28(20) 17 10.3.4.5,40001 > 10.1.1.1,1025 -ip 40(20) 6 10.3.4.5,40000 > 10.1.2.1,80 -ip 40(20) 6 10.3.4.5,40001 > 10.1.3.1,80 -ip 40(20) 6 10.3.4.5,40000 > 10.1.4.1,80 -ip 40(20) 6 10.3.4.5,40001 > 10.1.4.1,80 -ip 20(20) 0 10.1.1.1 > 10.1.1.2 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 20(20) 0 10.1.1.2 > 10.1.1.1 -ip 40(20) 6 10.3.4.5,40000 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -ip 40(20) 6 10.3.4.5,40001 > 10.3.4.5,40000 -ip 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -ip 28(20) 17 10.3.4.5,40000 > 10.3.4.5,40001 -ip 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -ip 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -------------------------------- diff --git a/dist/ipf/test/expected/n6 b/dist/ipf/test/expected/n6 deleted file mode 100644 index d28d4f1ee4d7..000000000000 --- a/dist/ipf/test/expected/n6 +++ /dev/null @@ -1,70 +0,0 @@ -ip 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -ip 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -ip 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -ip 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -ip 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -ip 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- -ip 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -ip 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -ip 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -ip 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -ip 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- -ip 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -ip 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -ip 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -ip 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -ip 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.1,23 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -ip 40(20) 6 10.3.0.1,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -ip 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -ip 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -ip 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.1,23 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -ip 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -ip 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -ip 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -ip 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -ip 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -ip 28(20) 17 10.3.3.3,12345 > 10.2.2.1,10053 -ip 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -ip 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -------------------------------- diff --git a/dist/ipf/test/expected/n7 b/dist/ipf/test/expected/n7 deleted file mode 100644 index 51aa987c2da6..000000000000 --- a/dist/ipf/test/expected/n7 +++ /dev/null @@ -1,20 +0,0 @@ -ip 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22 -ip 40(20) 6 10.2.3.1,1231 > 10.2.2.1,10023 -ip 40(20) 6 10.2.3.1,1232 > 10.2.2.1,10050 -ip 40(20) 6 10.2.3.1,1233 > 10.2.2.1,10079 -ip 40(20) 6 10.2.3.1,1234 > 10.1.1.1,80 -ip 40(20) 6 10.2.3.1,1235 > 10.1.1.2,80 -ip 40(20) 6 10.2.3.1,1236 > 10.1.1.3,80 -ip 40(20) 6 10.2.3.1,1237 > 10.1.1.4,80 -ip 40(20) 6 10.2.3.1,1238 > 10.1.1.4,80 -------------------------------- -ip 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22 -ip 40(20) 6 10.2.3.1,1231 > 10.1.1.1,23 -ip 40(20) 6 10.2.3.1,1232 > 10.1.1.1,50 -ip 40(20) 6 10.2.3.1,1233 > 10.1.1.1,79 -ip 40(20) 6 10.2.3.1,1234 > 10.2.2.1,3128 -ip 40(20) 6 10.2.3.1,1235 > 1.2.2.129,3128 -ip 40(20) 6 10.2.3.1,1236 > 10.2.2.1,3128 -ip 40(20) 6 10.2.3.1,1237 > 1.2.2.129,3128 -ip 40(20) 6 10.2.3.1,1238 > 10.2.2.1,3128 -------------------------------- diff --git a/dist/ipf/test/expected/ni1 b/dist/ipf/test/expected/ni1 deleted file mode 100644 index 29eac738ad41..000000000000 --- a/dist/ipf/test/expected/ni1 +++ /dev/null @@ -1,3 +0,0 @@ -4500 0028 4706 4000 0111 ced8 0606 0606 0404 0404 afc9 829e 0014 0b2d 0402 0000 3be5 468d 000a cfc3 -4500 0038 809a 0000 ff01 8f31 0303 0303 0202 0202 0b00 a537 0000 0000 4500 0028 4703 4000 0111 ef89 0202 0202 0404 0404 afc9 829e 0014 1d4f -------------------------------- diff --git a/dist/ipf/test/expected/ni2 b/dist/ipf/test/expected/ni2 deleted file mode 100644 index b849e417d326..000000000000 --- a/dist/ipf/test/expected/ni2 +++ /dev/null @@ -1,10 +0,0 @@ -4510 002c bd0d 4000 3e06 ea1d 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 2ca8 0000 0204 05b4 -4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 -4510 0028 bd0e 4000 3e06 ea20 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 29e3 0000 -4500 005b cf83 4000 7e06 9788 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 bd18 4000 3e06 ea16 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 -4510 002e bd1e 4000 3e06 ea0a 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 1c98 0000 0000 0000 0d0a -4500 0048 e383 4000 7e06 839b 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 7d07 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 d71d 4000 4001 f0be 0101 0101 c0a8 0133 0304 348b 0000 05a0 4500 05dc e483 4000 7e06 8707 c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 -------------------------------- diff --git a/dist/ipf/test/expected/ni4 b/dist/ipf/test/expected/ni4 deleted file mode 100644 index bd7179ff61e1..000000000000 --- a/dist/ipf/test/expected/ni4 +++ /dev/null @@ -1,4 +0,0 @@ -4500 003c 4706 4000 ff06 28aa 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 3323 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 3303 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/dist/ipf/test/expected/ni5 b/dist/ipf/test/expected/ni5 deleted file mode 100644 index 050e2577bbf5..000000000000 --- a/dist/ipf/test/expected/ni5 +++ /dev/null @@ -1,47 +0,0 @@ -4500 002c 10c9 4000 ff06 3289 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 10ca 4000 ff06 328c 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000 -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 10cb 4000 ff06 328b 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 10cc 4000 ff06 328a 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5010 269c 59ba 0000 -4500 0038 10cd 4000 ff06 3279 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 10ce 4000 ff06 3288 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5010 269c 5966 0000 -4500 0036 10cf 4000 ff06 3279 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5018 269c 373f 0000 5041 5353 2061 7661 6c6f 6e40 0d0a -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 10d0 4000 ff06 3286 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 10d1 4000 ff06 3285 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5010 269c 58b0 0000 -4500 0030 10d2 4000 ff06 327c 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 10d3 4000 ff06 3283 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5010 269c 5898 0000 -4500 003d 10d4 4000 ff06 3269 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 10d5 4000 ff06 3279 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 10d6 4000 ff06 327a 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 10d7 4000 ff06 327b c0a8 0103 96cb e002 8033 0014 bd78 5c12 d9f8 11d5 6012 02f8 d734 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 10d8 4000 ff06 327e c0a8 0103 96cb e002 8033 0014 bd78 5c13 d9f8 11d5 5010 6348 8e71 0000 -4500 0063 ffea 4000 ef06 5330 96cb e002 c0a8 0103 0014 8033 d9f8 11d5 bd78 5c13 5018 269c a315 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 -4500 0028 10d9 4000 ff06 327d c0a8 0103 96cb e002 8033 0014 bd78 5c13 d9f8 1210 5010 6348 8e36 0000 -4500 0028 ffeb 4000 ef06 536a 96cb e002 c0a8 0103 0014 8033 d9f8 1210 bd78 5c13 5011 269c cae1 0000 -4500 0028 10da 4000 ff06 327c c0a8 0103 96cb e002 8033 0014 bd78 5c13 d9f8 1211 5010 6348 8e35 0000 -4500 0028 10db 4000 ff06 327b c0a8 0103 96cb e002 8033 0014 bd78 5c13 d9f8 1211 5011 6348 8e34 0000 -4500 0028 ffec 4000 ef06 5369 96cb e002 c0a8 0103 0014 8033 d9f8 1211 bd78 5c14 5010 269c cae0 0000 -4500 0028 10dc 4000 ff06 327a 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 790a 5010 269c 5812 0000 -4500 0040 ffed 4000 ef06 5350 96cb e002 c0a8 0103 0015 8032 3786 790a bd6b ca1a 5018 269c 7c9e 0000 3232 3620 4c69 7374 696e 6720 636f 6d70 6c65 7465 642e 0d0a -4500 0030 10dd 4000 ff06 3271 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 7922 5018 269c 85f8 0000 5459 5045 2049 0d0a -4500 0038 ffee 4000 ef06 5357 96cb e002 c0a8 0103 0015 8032 3786 7922 bd6b ca22 5018 269c 5ef0 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a -4500 0028 10de 4000 ff06 3278 0101 0101 96cb e002 8032 0015 bd6b ca1a 3786 7932 5010 269c 57e2 0000 -4500 002e 10df 4000 ff06 3271 0101 0101 96cb e002 8032 0015 bd6b ca1a 3786 7932 5018 269c b020 0000 5155 4954 0d0a -4500 0036 ffef 4000 ef06 5358 96cb e002 c0a8 0103 0015 8032 3786 7932 bd6b ca28 5018 269c a93c 0000 3232 3120 476f 6f64 6279 652e 0d0a -4500 0028 10e0 4000 ff06 3276 0101 0101 96cb e002 8032 0015 bd6b ca20 3786 7940 5011 269c 57cd 0000 -4500 0028 fff0 4000 ef06 5365 96cb e002 c0a8 0103 0015 8032 3786 7940 bd6b ca28 5011 269c 981b 0000 -4500 0028 10e1 4000 ff06 3275 c0a8 0103 96cb e002 8032 0015 bd6b ca25 3786 7941 5010 269c 981e 0000 -4500 0028 fff1 4000 ef06 5364 96cb e002 c0a8 0103 0015 8032 3786 7941 bd6b ca29 5010 269c 981a 0000 -------------------------------- diff --git a/dist/ipf/test/hextest b/dist/ipf/test/hextest deleted file mode 100644 index 2d3e4fee68ea..000000000000 --- a/dist/ipf/test/hextest +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# $NetBSD: hextest,v 1.2 1999/12/11 23:22:14 veego Exp $ -# -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 -( while read rule; do - echo "$rule" | ../ipftest -br - -Hi 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/dist/ipf/test/input/f1 b/dist/ipf/test/input/f1 deleted file mode 100644 index 7c3ae8a3a3db..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f10 b/dist/ipf/test/input/f10 deleted file mode 100644 index 254cee7316ff..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f11 b/dist/ipf/test/input/f11 deleted file mode 100644 index 25c670d18332..000000000000 --- a/dist/ipf/test/input/f11 +++ /dev/null @@ -1,16 +0,0 @@ -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 S -in on e0 tcp 1.1.1.1,1 2.1.2.2,24 SA -in on e1 tcp 2.1.2.2,23 1.1.1.1,2 SA -in on e1 tcp 2.1.2.2,23 1.1.1.1,1 SA -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 A -in on e0 tcp 1.1.1.1,1 2.1.2.2,25 A -in on e1 tcp 2.1.2.2,23 1.1.1.1,1 A -in on e1 tcp 2.1.2.2,25 1.1.1.1,1 A -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 F -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 A -in on e0 tcp 1.1.1.1,2 2.1.2.2,23 A -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/dist/ipf/test/input/f12 b/dist/ipf/test/input/f12 deleted file mode 100644 index 5d9c1de3590d..000000000000 --- a/dist/ipf/test/input/f12 +++ /dev/null @@ -1,35 +0,0 @@ -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF SYN -45 00 0028 0000 4000 3f 06 0000 01010101 02010101 -0401 0019 00000000 00000000 50 02 2000 0000 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF ACK -45 00 0028 0000 4000 3f 06 0000 01010101 02010101 -0401 0019 00000000 00000000 50 10 2000 0000 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 ACK -45 00 0028 0000 6000 3f 06 0000 01010101 02010101 -0401 0019 00000000 00000000 50 10 2000 0000 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 -45 00 001c 0000 6000 3f 06 0000 01010101 02010101 -0401 0019 00000000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 ACK -45 00 001c 0000 6001 3f 06 0000 01010101 02010101 -00000000 50 10 2000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 -45 00 0014 0000 6000 3f 11 0000 01010101 02010101 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -45 00 0018 0000 2000 3f 11 0000 01010101 02010101 -0035 0035 - -# 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 -45 00 001c 0000 2000 3f 11 0000 01010101 02010101 -0001 0001 0004 0000 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -45 00 001c 0000 2000 3f 11 0000 01010101 02010101 -0035 0035 0004 0000 - diff --git a/dist/ipf/test/input/f13 b/dist/ipf/test/input/f13 deleted file mode 100644 index b90d6bacdf6b..000000000000 --- a/dist/ipf/test/input/f13 +++ /dev/null @@ -1,43 +0,0 @@ -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF,MF,FO=0 SYN -45 00 0028 0001 4000 3f 06 0000 01010101 02010101 -0401 0019 00000000 00000000 50 02 2000 0000 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP MF ACK -45 00 0024 0002 2000 3f 06 0000 01010101 02010101 -0401001900000000 0000000050102000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP FO=2 ACK -45 00 002c 0002 0002 3f 06 0000 01010101 02010101 -0000000000010203 0405060708090a0b 0c0d0e0f10111213 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 SYN -45 00 0028 0003 6000 3f 06 0000 01010101 02010101 -0401 0019 00000000 00000000 50 10 2000 0000 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 -45 00 001c 0004 6000 3f 06 0000 01010101 02010101 -0401 0019 00000000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 SYN -45 00 001c 0005 6001 3f 06 0000 01010101 02010101 -00000000 50 10 2000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 -45 00 0014 0006 6000 3f 11 0000 01010101 02010101 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -45 00 0018 0007 2000 3f 11 0000 01010101 02010101 -0035 0035 - -# 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 -45 00 001c 0008 2000 3f 11 0000 01010101 02010101 -0035003500040000 - -# 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 (short) -45 00 0018 0008 2000 3f 11 0000 01010101 02010101 -00350036 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP FO=1 -45 00 001c 0008 0001 3f 11 0000 01010101 02010101 -0000000000000000 - diff --git a/dist/ipf/test/input/f14 b/dist/ipf/test/input/f14 deleted file mode 100644 index 16a806ffec7b..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f15 b/dist/ipf/test/input/f15 deleted file mode 100644 index db547cb4f326..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f16 b/dist/ipf/test/input/f16 deleted file mode 100644 index a17f41f756ec..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f17 b/dist/ipf/test/input/f17 deleted file mode 100644 index 7ab1aab4840f..000000000000 --- a/dist/ipf/test/input/f17 +++ /dev/null @@ -1,61 +0,0 @@ -# (1.1.1.1,54076,seq=0xbfd08989) -> (2.2.2.2,25,seq=0) SYN -[out,ppp0] -4500 003c 8262 0000 4006 8417 0101 0101 -0202 0202 d33c 0019 bfd0 8989 0000 0000 -a002 4000 6190 0000 0204 05b4 0103 0300 -0101 080a 008e 17f7 0000 0000 - -# (2.2.2.2,25,seq=0x40203436) -> (1.1.1.1,54076,seq=0xbfdfcbc9) ACK -[in,ppp0] -4500 003c 8262 0000 1106 b317 0202 0202 -0101 0101 0019 d33c 4020 3436 bfdf cbc9 -5010 4000 fb0c 0000 0204 0584 0103 0300 -0101 080a 008e 17f7 0000 0000 - -# (1.1.1.1,54076,seq=0xbfd08989) -> (2.2.2.2,25,seq=0x0) SYN -[out,ppp0] -4500 003c 8265 0000 4006 8414 0101 0101 -0202 0202 d33c 0019 bfd0 8989 0000 0000 -a002 4000 6185 0000 0204 05b4 0103 0300 -0101 080a 008e 1802 0000 0000 - -# (2.2.2.2,25,seq=0xed674d4e) -> (1.1.1.1,54076,seq=0xbfd0898a) SYN-ACK -[in,ppp0] -4500 002c 7442 4000 2906 6947 0202 0202 -0101 0101 0019 d33c ed67 4d4e bfd0 898a -6012 2118 ab84 0000 0204 0584 - -# -# (2.2.2.2,25,seq=0xbfd0898a) -> (1.1.1.1,54076,seq=0xed674d4e) ACK -[out,ppp0] -4500 002c 8262 0000 4006 8417 0101 0101 -0202 0202 d33c 0019 bfd0 898a ed67 4d4e -5010 4000 6190 0000 0000 - -# (1.1.1.1,54076,seq=0xcfd08989) -> (2.2.2.2,25,seq=0x0) SYN -[out,ppp0] -4500 003c 8265 0000 4006 8414 0101 0101 -0202 0202 d33c 0019 cfd0 8989 0000 0000 -a002 4000 6185 0000 0204 05b4 0103 0300 -0101 080a 008e 1802 0000 0000 - -# (1.1.1.1,54076,seq=0xcfd08989) -> (2.2.2.2,25,seq=0x0) SYN -[out,ppp0] -4500 003c 8266 0000 4006 8413 0101 0101 -0202 0202 d33c 0019 cfd0 8989 0000 0000 -a002 4000 6185 0000 0204 05b4 0103 0300 -0101 080a 008e 1802 0000 0000 - -# (2.2.2.2,25,seq=0xed674d4e) -> (1.1.1.1,54076,seq=0xcfd0898a) SYN-ACK -[in,ppp0] -4500 002c 7442 4000 2906 6947 0202 0202 -0101 0101 0019 d33c ed67 4d4e cfd0 898a -6012 2118 ab84 0000 0204 0584 - -# -# (2.2.2.2,25,seq=0xcfd0898a) -> (1.1.1.1,54076,seq=0xed674d4e) ACK -[out,ppp0] -4500 002c 8262 0000 4006 8417 0101 0101 -0202 0202 d33c 0019 cfd0 898a ed67 4d4e -5010 4000 6190 0000 0000 - diff --git a/dist/ipf/test/input/f2 b/dist/ipf/test/input/f2 deleted file mode 100644 index d168af0c716a..000000000000 --- a/dist/ipf/test/input/f2 +++ /dev/null @@ -1,6 +0,0 @@ -in tcp 127.0.0.1,1 127.0.0.1,21 -in tcp 1.1.1.1,1 1.2.1.1,21 -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/dist/ipf/test/input/f3 b/dist/ipf/test/input/f3 deleted file mode 100644 index 16a806ffec7b..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f4 b/dist/ipf/test/input/f4 deleted file mode 100644 index 2956d1b15454..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f5 b/dist/ipf/test/input/f5 deleted file mode 100644 index 41600c10763b..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f6 b/dist/ipf/test/input/f6 deleted file mode 100644 index 21f0be3336c5..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f7 b/dist/ipf/test/input/f7 deleted file mode 100644 index 2721af2fb71e..000000000000 --- a/dist/ipf/test/input/f7 +++ /dev/null @@ -1,9 +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 diff --git a/dist/ipf/test/input/f8 b/dist/ipf/test/input/f8 deleted file mode 100644 index cace511fbeb8..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/f9 b/dist/ipf/test/input/f9 deleted file mode 100644 index 33f3be392a7d..000000000000 --- a/dist/ipf/test/input/f9 +++ /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 opt lsrr,ssrr -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/dist/ipf/test/input/ipv6.2 b/dist/ipf/test/input/ipv6.2 deleted file mode 100644 index 9cf16dc9edea..000000000000 --- a/dist/ipf/test/input/ipv6.2 +++ /dev/null @@ -1,28 +0,0 @@ -.\" $NetBSD: ipv6.2,v 1.1.1.1 2002/05/02 16:59:10 martti Exp $ -.\" -[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/dist/ipf/test/input/l1 b/dist/ipf/test/input/l1 deleted file mode 100644 index afda0db3971b..000000000000 --- a/dist/ipf/test/input/l1 +++ /dev/null @@ -1,52 +0,0 @@ -# 1.1.1.1,1025 -> 2.2.2.2,25 TTL=63 TCP DF SYN -45 00 0028 0000 4000 3f 06 0000 01010101 02020202 -0401 0019 00000000 00000000 50 02 2000 0000 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -45 00 0028 0000 4000 3f 06 0000 01010101 02020202 -0401 0019 00000000 00000000 50 10 2000 0000 0000 - -#in on e1 tcp 2.1.2.2,25 1.1.1.1,1025 AS -45 00 0028 0000 4000 3f 06 0000 02020202 01010101 -0019 0401 00000000 00000000 50 12 2000 0000 0000 - -#in on e1 tcp 2.1.2.2,25 1.1.1.1,1025 A -[out,e1] 45 00 0028 0000 4000 3f 06 0000 02020202 01010101 -0019 0401 00000000 00000000 50 10 2000 0000 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 F -45 00 0028 0000 4000 3f 06 0000 01010101 02020202 -0401 0019 00000000 00000000 50 01 2000 0000 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -45 00 0028 0000 4000 3f 06 0000 01010101 02020202 -0401 0019 00000000 00000000 50 10 2000 0000 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -45 00 0028 0000 4000 3f 06 0000 01010101 02020202 -0401 0019 00000000 00000000 50 10 2000 0000 0000 - -#in on e1 udp 1.1.1.1,1 4.4.4.4,53 -45 00 0028 0000 4000 3f 11 0000 01010101 04040404 -0001 0035 0000 0000 0102 0304 0506 0708 090a 0b0d - -#in on e1 udp 2.2.2.2,2 4.4.4.4,53 -45 00 0028 0000 4000 3f 11 0000 02020202 04040404 -0001 0035 0000 0000 0102 0304 0506 0708 090a 0b0d - -#in on e1 udp 2.2.2.2,2 4.4.4.4,53 -45 00 0038 0000 4000 3f 11 0000 02020202 04040404 -0001 0035 0000 0000 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 -45 00 0014 0000 4000 3f 00 0000 02020202 04040404 - -#in on e0 udp 3.3.3.3,1023 1.1.1.1,2049 -45 00 001c 0000 4000 3f 11 0000 03030303 01010101 -03ff 0801 0000 0000 - -#in on e0 udp 1.1.1.1,2049 3.3.3.3,1023 -45 00 001c 0000 4000 3f 11 0000 01010101 03030303 -0801 03ff 0000 0000 - diff --git a/dist/ipf/test/input/n1 b/dist/ipf/test/input/n1 deleted file mode 100644 index a60739036f86..000000000000 --- a/dist/ipf/test/input/n1 +++ /dev/null @@ -1,31 +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 diff --git a/dist/ipf/test/input/n2 b/dist/ipf/test/input/n2 deleted file mode 100644 index 476f16ed1283..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/n3 b/dist/ipf/test/input/n3 deleted file mode 100644 index deca3178daee..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/n4 b/dist/ipf/test/input/n4 deleted file mode 100644 index 52c2d88ff43e..000000000000 --- a/dist/ipf/test/input/n4 +++ /dev/null @@ -1,5 +0,0 @@ -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,23 -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,53 -in on zx0 tcp 10.3.3.3,12345 10.1.0.0,23 -in on zx0 udp 10.3.3.3,12345 10.1.1.0,53 -in on zx0 tcp 10.3.3.3,12345 10.1.1.0,53 diff --git a/dist/ipf/test/input/n5 b/dist/ipf/test/input/n5 deleted file mode 100644 index 579210b3a369..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/n6 b/dist/ipf/test/input/n6 deleted file mode 100644 index 8a0c924b36a0..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/n7 b/dist/ipf/test/input/n7 deleted file mode 100644 index 79af9010825d..000000000000 --- a/dist/ipf/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/dist/ipf/test/input/ni1 b/dist/ipf/test/input/ni1 deleted file mode 100644 index a099f8004d6d..000000000000 --- a/dist/ipf/test/input/ni1 +++ /dev/null @@ -1,6 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP timeout exceeded in reply to a ICMP packet going out. -[out,df0] 45 00 0028 4706 4000 01 11 ced8 0202 0202 0404 0404 afc9 829e 0014 1335 0402 0000 3be5 468d 000a cfc3 - -[in,df0] 45 00 0038 809a 0000 ff 01 8f31 0303 0303 0101 0101 0b00 ad3f 0000 0000 4500 0028 4703 4000 0111 e781 0606 0606 0404 0404 afc9 829e 0014 1547 - diff --git a/dist/ipf/test/input/ni2 b/dist/ipf/test/input/ni2 deleted file mode 100644 index 3f7dbcbfd3cb..000000000000 --- a/dist/ipf/test/input/ni2 +++ /dev/null @@ -1,161 +0,0 @@ -# Test of fragmentation required coming from the inside. -[out,xl0] -4510 002c bd0d 4000 3e06 ea1d -0a01 0201 -c0a8 0133 -05f6 0077 a664 2485 0000 0000 -6002 4000 b8f2 0000 0204 05b4 - -[in,xl0] -4500 002c ce83 4000 7e06 98b7 -c0a8 0133 -0a01 0201 -0077 05f6 fbdf 1a21 a664 2486 -6012 2238 c0a8 0000 0204 05b4 0000 - -[out,xl0] -4510 0028 bd0e 4000 3e06 ea20 -0a01 0201 -c0a8 0133 -05f6 0077 a664 2486 fbdf 1a22 -5010 4470 b62d 0000 - -[in,xl0] -4500 005b cf83 4000 7e06 9788 -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 ea16 -0a01 0201 -c0a8 0133 -05f6 0077 a664 2486 fbdf 1a55 -5010 4470 b5fa 0000 - -[out,xl0] -4510 002e bd1e 4000 3e06 ea0a -0a01 0201 -c0a8 0133 -05f6 0077 a664 2486 fbdf 1a55 -5018 4470 a8e2 0000 0000 0000 0d0a - -[in,xl0] -4500 0048 e383 4000 7e06 839b -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 7d07 -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 ce16 -c0a8 6401 -c0a8 0133 -0304 cad5 0000 05a0 4500 05dc -e483 4000 7e06 7d07 c0a8 0133 0a01 0201 -0077 05f6 fbdf 1a75 - diff --git a/dist/ipf/test/input/ni4 b/dist/ipf/test/input/ni4 deleted file mode 100644 index 445d7c8d63b1..000000000000 --- a/dist/ipf/test/input/ni4 +++ /dev/null @@ -1,10 +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] 45 00 00 3c 47 06 40 00 ff 06 28 aa 02 02 02 02 04 04 04 04 50 00 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 d8 e2 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 - -[in,df0] 45 00 00 38 80 9a 00 00 ff 01 33 23 03 03 03 03 01 01 01 01 03 03 60 6b 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 9c 40 00 50 00 00 00 01 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[in,df0] 45 00 00 58 80 9a 00 00 ff 01 33 03 03 03 03 03 01 01 01 01 03 03 11 3f 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 9c 40 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 84 9a 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 - diff --git a/dist/ipf/test/input/ni5 b/dist/ipf/test/input/ni5 deleted file mode 100644 index cd3d7ce050bb..000000000000 --- a/dist/ipf/test/input/ni5 +++ /dev/null @@ -1,276 +0,0 @@ -[out,ppp0] -4500 002c 10c9 4000 ff06 3289 c0a8 0103 -96cb e002 8032 0015 bd6b c9c8 0000 0000 -6002 2238 35f9 0000 0204 05b4 3cb9 - -[in,ppp0] -4500 002c ffdd 4000 ef06 5374 96cb e002 -0101 0101 0015 8032 3786 76c4 bd6b c9c9 -6012 269c 4313 0000 0204 0584 - -[out,ppp0] -4500 0028 10ca 4000 ff06 328c c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 76c5 -5010 269c 9af6 0000 c0a8 0103 0015 - -[in,ppp0] -4500 006f ffde 4000 ef06 5330 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 - -[out,ppp0] -4500 0028 10cb 4000 ff06 328b c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 770c -5010 269c 9aaf 0000 0111 aa28 c0a8 - -[in,ppp0] -4500 00c7 ffdf 4000 ef06 52d7 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 - -[out,ppp0] -4500 0028 10cc 4000 ff06 328a c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 77ab -5010 269c 9a10 0000 c0a8 0103 206c - -[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 - -[in,ppp0] -4500 0028 ffe0 4000 ef06 5375 96cb e002 -0101 0101 0015 8032 3786 77ab bd6b c9d9 -5010 269c 59aa 0000 - -[in,ppp0] -4500 006c ffe1 4000 ef06 5330 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 - -[out,ppp0] -4500 0028 10ce 4000 ff06 3288 c0a8 0103 -96cb e002 8032 0015 bd6b c9d9 3786 77ef -5010 269c 99bc 0000 c0a8 0103 0015 - -[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 - -[in,ppp0] -4500 005f ffe2 4000 ef06 533c 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 - -[out,ppp0] -4500 0028 10d0 4000 ff06 3286 c0a8 0103 -96cb e002 8032 0015 bd6b c9e7 3786 7826 -5010 269c 9977 0000 0000 0800 207a - -[in,ppp0] -4500 0099 ffe3 4000 ef06 5301 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 - -[out,ppp0] -4500 0028 10d1 4000 ff06 3285 c0a8 0103 -96cb e002 8032 0015 bd6b c9e7 3786 7897 -5010 269c 9906 0000 c0a8 0103 0015 - -[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 - -[in,ppp0] -4500 0038 ffe4 4000 ef06 5361 96cb e002 -0101 0101 0015 8032 3786 7897 bd6b c9ef -5018 269c 1f58 0000 3230 3020 5479 7065 -206f 6b61 792e 0d0a - -[out,ppp0] -4500 0028 10d3 4000 ff06 3283 c0a8 0103 -96cb e002 8032 0015 bd6b c9ef 3786 78a7 -5010 269c 98ee 0000 c0a8 0103 0015 - -[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 - -[in,ppp0] -4500 0046 ffe5 4000 ef06 5352 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 - -[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 - -[in,ppp0] -4500 0038 ffe6 4000 ef06 535f 96cb e002 -0101 0101 0015 8032 3786 78c5 bd6b ca10 -5018 269c 1f09 0000 3230 3020 5479 7065 -206f 6b61 792e 0d0a - -[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 - -[in,ppp0] -4500 002c ffe7 4000 ef06 536a 96cb e002 -0101 0101 0014 8033 d9f8 11d4 0000 0000 -6002 2238 913a 0000 0204 0584 - -[out,ppp0] -4500 002c 10d7 4000 ff06 327b c0a8 0103 -96cb e002 8033 0014 bd78 5c12 d9f8 11d5 -6012 02f8 d734 0000 0204 0584 3cc7 - -[in,ppp0] -4500 0028 ffe8 4000 ef06 536d 96cb e002 -0101 0101 0014 8033 d9f8 11d5 bd78 5c13 -5010 269c 8ac7 0000 - -[in,ppp0] -4500 005d ffe9 4000 ef06 5337 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 - -[out,ppp0] -4500 0028 10d8 4000 ff06 327e c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 11d5 -5010 6348 8e71 0000 c0a8 0103 0015 - -[in,ppp0] -4500 0063 ffea 4000 ef06 5330 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 - -[out,ppp0] -4500 0028 10d9 4000 ff06 327d c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1210 -5010 6348 8e36 0000 c0a8 0103 0014 - -[in,ppp0] -4500 0028 ffeb 4000 ef06 536a 96cb e002 -0101 0101 0014 8033 d9f8 1210 bd78 5c13 -5011 269c 8a8b 0000 - -[out,ppp0] -4500 0028 10da 4000 ff06 327c c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1211 -5010 6348 8e35 0000 c0a8 0103 0014 - -[out,ppp0] -4500 0028 10db 4000 ff06 327b c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1211 -5011 6348 8e34 0000 c0a8 0103 0014 - -[in,ppp0] -4500 0028 ffec 4000 ef06 5369 96cb e002 -0101 0101 0014 8033 d9f8 1211 bd78 5c14 -5010 269c 8a8a 0000 - -[out,ppp0] -4500 0028 10dc 4000 ff06 327a c0a8 0103 -96cb e002 8032 0015 bd6b ca16 3786 790a -5010 269c 9864 0000 c0a8 0103 0014 - -[in,ppp0] -4500 0040 ffed 4000 ef06 5350 96cb e002 -0101 0101 0015 8032 3786 790a bd6b ca16 -5018 269c 3c4c 0000 3232 3620 4c69 7374 -696e 6720 636f 6d70 6c65 7465 642e 0d0a - -[out,ppp0] -4500 0030 10dd 4000 ff06 3271 c0a8 0103 -96cb e002 8032 0015 bd6b ca16 3786 7922 -5018 269c c64a 0000 5459 5045 2049 0d0a - -[in,ppp0] -4500 0038 ffee 4000 ef06 5357 96cb e002 -0101 0101 0015 8032 3786 7922 bd6b ca1e -5018 269c 1e9e 0000 3230 3020 5479 7065 -206f 6b61 792e 0d0a - -[out,ppp0] -4500 0028 10de 4000 ff06 3278 c0a8 0103 -96cb e002 8032 0015 bd6b ca1e 3786 7932 -5010 269c 9834 0000 6720 636f 6d70 - -[out,ppp0] -4500 002e 10df 4000 ff06 3271 c0a8 0103 -96cb e002 8032 0015 bd6b ca1e 3786 7932 -5018 269c f072 0000 5155 4954 0d0a - -[in,ppp0] -4500 0036 ffef 4000 ef06 5358 96cb e002 -0101 0101 0015 8032 3786 7932 bd6b ca24 -5018 269c 68ea 0000 3232 3120 476f 6f64 -6279 652e 0d0a - -[out,ppp0] -4500 0028 10e0 4000 ff06 3276 c0a8 0103 -96cb e002 8032 0015 bd6b ca24 3786 7940 -5011 269c 981f 0000 c0a8 0103 0015 - -[in,ppp0] -4500 0028 fff0 4000 ef06 5365 96cb e002 -0101 0101 0015 8032 3786 7940 bd6b ca24 -5011 269c 57c9 0000 - -[out,ppp0] -4500 0028 10e1 4000 ff06 3275 c0a8 0103 -96cb e002 8032 0015 bd6b ca25 3786 7941 -5010 269c 981e 0000 0663 6f6f 6d62 - -[in,ppp0] -4500 0028 fff1 4000 ef06 5364 96cb e002 -0101 0101 0015 8032 3786 7941 bd6b ca25 -5010 269c 57c8 0000 - diff --git a/dist/ipf/test/intest b/dist/ipf/test/intest deleted file mode 100644 index 98241fc0627b..000000000000 --- a/dist/ipf/test/intest +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -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 -../ipnat -nvf regress/$1 2>/dev/null > results/$1 -cmp expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - $TOUCH $1 -fi -exit $status diff --git a/dist/ipf/test/itest b/dist/ipf/test/itest deleted file mode 100644 index e6a1da3d95d8..000000000000 --- a/dist/ipf/test/itest +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# $NetBSD: itest,v 1.2 1999/12/11 23:22:14 veego Exp $ -# -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 -../ipf -nvf regress/$1 2>/dev/null > results/$1 -cmp expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - $TOUCH $1 -fi -exit $status diff --git a/dist/ipf/test/logtest b/dist/ipf/test/logtest deleted file mode 100644 index 38d93eeb629f..000000000000 --- a/dist/ipf/test/logtest +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -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 -/bin/cp /dev/null results/$1.b - -( while read rule; do - echo $rule >> results/$1 - echo $rule | ../ipftest -br - -Hi input/$1 -l logout > /dev/null - if [ $? -ne 0 ] ; then - /bin/rm -f logout - exit 1 - fi - 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 -Hi 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/dist/ipf/test/mhtest b/dist/ipf/test/mhtest deleted file mode 100644 index 52a002754b14..000000000000 --- a/dist/ipf/test/mhtest +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# multiple rules at the same time - -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 -br regress/$1 -Hi input/$1 > results/$1 -if [ $? -ne 0 ] ; then - exit 1 -fi -echo "--------" >> results/$1 - -cmp expected/$1 results/$1 -status=$? -if [ $status -ne 0 ] ; then - exit $status -fi -cmp expected/$1 results/$1 -status=$? -if [ $status -ne 0 ] ; then - exit $status -fi -$TOUCH $1 -exit 0 diff --git a/dist/ipf/test/mtest b/dist/ipf/test/mtest deleted file mode 100644 index b185abb2bf7f..000000000000 --- a/dist/ipf/test/mtest +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# multiple rules at the same time - -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 -br regress/$1 -i input/$1 > results/$1 -if [ $? -ne 0 ] ; then - exit 1 -fi -echo "--------" >> results/$1 - -cmp expected/$1 results/$1 -status=$? -if [ $status -ne 0 ] ; then - exit $status -fi -cmp expected/$1 results/$1 -status=$? -if [ $status -ne 0 ] ; then - exit $status -fi -$TOUCH $1 -exit 0 diff --git a/dist/ipf/test/natipftest b/dist/ipf/test/natipftest deleted file mode 100644 index 8627168ed2cd..000000000000 --- a/dist/ipf/test/natipftest +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -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 -( while read rule; do - echo "$rule" | ../ipftest -bHx -r regress/$1.ipf -Nr - -i input/$1 >> \ - results/$1; - if [ $? -ne 0 ] ; then - exit 1; - fi - echo "-------------------------------" >> results/$1 -done ) < regress/$1.nat -cmp expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - $TOUCH $1 -fi -exit $status diff --git a/dist/ipf/test/nattest b/dist/ipf/test/nattest deleted file mode 100644 index 1eae55ef6edb..000000000000 --- a/dist/ipf/test/nattest +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# $NetBSD: nattest,v 1.2 1999/12/11 23:22:14 veego Exp $ -# -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 -( while read rule; do - echo "$rule" | ../ipftest -Nbr - -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/dist/ipf/test/regress/f1 b/dist/ipf/test/regress/f1 deleted file mode 100644 index 6a2ede9e31c0..000000000000 --- a/dist/ipf/test/regress/f1 +++ /dev/null @@ -1,4 +0,0 @@ -block in all -pass in all -block out all -pass out all diff --git a/dist/ipf/test/regress/f10 b/dist/ipf/test/regress/f10 deleted file mode 100644 index 355298308e72..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f11 b/dist/ipf/test/regress/f11 deleted file mode 100644 index a71e528c2215..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f12 b/dist/ipf/test/regress/f12 deleted file mode 100644 index c29f839aa502..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f13 b/dist/ipf/test/regress/f13 deleted file mode 100644 index f123e4781c86..000000000000 --- a/dist/ipf/test/regress/f13 +++ /dev/null @@ -1,6 +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 diff --git a/dist/ipf/test/regress/f14 b/dist/ipf/test/regress/f14 deleted file mode 100644 index 06ab51995ea2..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f15 b/dist/ipf/test/regress/f15 deleted file mode 100644 index 16185e1f3685..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f16 b/dist/ipf/test/regress/f16 deleted file mode 100644 index 920ad8c958d2..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f17 b/dist/ipf/test/regress/f17 deleted file mode 100644 index 9a75ae3c1b54..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f2 b/dist/ipf/test/regress/f2 deleted file mode 100644 index e2f02a46e283..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f3 b/dist/ipf/test/regress/f3 deleted file mode 100644 index ee80729cfc9b..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f4 b/dist/ipf/test/regress/f4 deleted file mode 100644 index bc8af2f0cae2..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f5 b/dist/ipf/test/regress/f5 deleted file mode 100644 index 998eabd4b10b..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f6 b/dist/ipf/test/regress/f6 deleted file mode 100644 index 291f09adcdbc..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f7 b/dist/ipf/test/regress/f7 deleted file mode 100644 index 6848a688a374..000000000000 --- a/dist/ipf/test/regress/f7 +++ /dev/null @@ -1,6 +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 diff --git a/dist/ipf/test/regress/f8 b/dist/ipf/test/regress/f8 deleted file mode 100644 index 0f28fd261148..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/f9 b/dist/ipf/test/regress/f9 deleted file mode 100644 index 17bc96737877..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/i1 b/dist/ipf/test/regress/i1 deleted file mode 100644 index 736801edcb2d..000000000000 --- a/dist/ipf/test/regress/i1 +++ /dev/null @@ -1,13 +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 -block in from any to !any -pass in on ed0 from localhost to localhost -block in log first on lo0 from any to any -pass in log body 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 diff --git a/dist/ipf/test/regress/i10 b/dist/ipf/test/regress/i10 deleted file mode 100644 index ece27126f0af..000000000000 --- a/dist/ipf/test/regress/i10 +++ /dev/null @@ -1,4 +0,0 @@ -pass in from localhost to localhost with 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/dist/ipf/test/regress/i11 b/dist/ipf/test/regress/i11 deleted file mode 100644 index c257f513eab3..000000000000 --- a/dist/ipf/test/regress/i11 +++ /dev/null @@ -1,4 +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 keep state -pass in proto udp from localhost to localhost port = 2049 keep frags -pass in proto udp from localhost to localhost port = 53 keep state keep frags diff --git a/dist/ipf/test/regress/i2 b/dist/ipf/test/regress/i2 deleted file mode 100644 index 101deaa30512..000000000000 --- a/dist/ipf/test/regress/i2 +++ /dev/null @@ -1,6 +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 17 from any to any -block in proto 250 from any to any -pass in proto tcp/udp from any to any diff --git a/dist/ipf/test/regress/i3 b/dist/ipf/test/regress/i3 deleted file mode 100644 index 15e98bfc71ff..000000000000 --- a/dist/ipf/test/regress/i3 +++ /dev/null @@ -1,10 +0,0 @@ -log in all -pass in from 128.0.0.1/24 to 128.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/dist/ipf/test/regress/i4 b/dist/ipf/test/regress/i4 deleted file mode 100644 index 1095ed97c91a..000000000000 --- a/dist/ipf/test/regress/i4 +++ /dev/null @@ -1,7 +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 < ntp -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 diff --git a/dist/ipf/test/regress/i5 b/dist/ipf/test/regress/i5 deleted file mode 100644 index 38482f3a584e..000000000000 --- a/dist/ipf/test/regress/i5 +++ /dev/null @@ -1,5 +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 diff --git a/dist/ipf/test/regress/i6 b/dist/ipf/test/regress/i6 deleted file mode 100644 index a35633bfd411..000000000000 --- a/dist/ipf/test/regress/i6 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on lo0 fastroute from any to any -pass in on lo0 dup-to qe0 from localhost to localhost -pass in on qe0 dup-to qe0:127.0.0.1 from localhost to localhost -block in quick on qe0 to qe1 from any to any diff --git a/dist/ipf/test/regress/i7 b/dist/ipf/test/regress/i7 deleted file mode 100644 index 4f3328d06a50..000000000000 --- a/dist/ipf/test/regress/i7 +++ /dev/null @@ -1,4 +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 diff --git a/dist/ipf/test/regress/i8 b/dist/ipf/test/regress/i8 deleted file mode 100644 index bde6ed52900e..000000000000 --- a/dist/ipf/test/regress/i8 +++ /dev/null @@ -1,2 +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 diff --git a/dist/ipf/test/regress/i9 b/dist/ipf/test/regress/i9 deleted file mode 100644 index 327cff45651d..000000000000 --- a/dist/ipf/test/regress/i9 +++ /dev/null @@ -1,5 +0,0 @@ -pass in from localhost to localhost with short -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 with not frag diff --git a/dist/ipf/test/regress/in1 b/dist/ipf/test/regress/in1 deleted file mode 100644 index 6f3b0637632d..000000000000 --- a/dist/ipf/test/regress/in1 +++ /dev/null @@ -1,24 +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 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 ftp 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 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 diff --git a/dist/ipf/test/regress/in2 b/dist/ipf/test/regress/in2 deleted file mode 100644 index 33151f0e85cd..000000000000 --- a/dist/ipf/test/regress/in2 +++ /dev/null @@ -1,22 +0,0 @@ -rdr le0 0/0 port 0 -> 1.1.1.1 port 0 -rdr le0 0/0 port 0 -> 1.1.1.1 port 0 ip -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 ip -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 udp -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp/udp -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 icmp -rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin -rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin -rdr le0 0/0 port 0 -> 1.1.1.1 port 0 ip frag -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 icmp frag -rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin frag -rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag -rdr le0 0/0 port 0 -> 1.1.1.1 port 0 ip frag age 10 -rdr le0 0/0 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 icmp frag age 10 -rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 -rdr le0 0/0 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 -rdr le0 0/0 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 diff --git a/dist/ipf/test/regress/in3 b/dist/ipf/test/regress/in3 deleted file mode 100644 index d8016b69e916..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/in4 b/dist/ipf/test/regress/in4 deleted file mode 100644 index 46bbd81012dc..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/ipv6.2 b/dist/ipf/test/regress/ipv6.2 deleted file mode 100644 index bc09b80378fa..000000000000 --- a/dist/ipf/test/regress/ipv6.2 +++ /dev/null @@ -1,5 +0,0 @@ -.\" $NetBSD: ipv6.2,v 1.1.1.1 2002/05/02 16:59:22 martti Exp $ -.\" -block in all -block out all -pass out proto 58 all keep state diff --git a/dist/ipf/test/regress/l1 b/dist/ipf/test/regress/l1 deleted file mode 100644 index 88cca58039f9..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/n1 b/dist/ipf/test/regress/n1 deleted file mode 100644 index 9bcf29be7ccf..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/n2 b/dist/ipf/test/regress/n2 deleted file mode 100644 index dbce5aa5254a..000000000000 --- a/dist/ipf/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 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 diff --git a/dist/ipf/test/regress/n3 b/dist/ipf/test/regress/n3 deleted file mode 100644 index 82c83dd6acc5..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/n4 b/dist/ipf/test/regress/n4 deleted file mode 100644 index b066c7ac2c56..000000000000 --- a/dist/ipf/test/regress/n4 +++ /dev/null @@ -1,5 +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 diff --git a/dist/ipf/test/regress/n5 b/dist/ipf/test/regress/n5 deleted file mode 100644 index e55cea02a82a..000000000000 --- a/dist/ipf/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 -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 diff --git a/dist/ipf/test/regress/n6 b/dist/ipf/test/regress/n6 deleted file mode 100644 index 79f11a40d88a..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/n7 b/dist/ipf/test/regress/n7 deleted file mode 100644 index 4abde530a21d..000000000000 --- a/dist/ipf/test/regress/n7 +++ /dev/null @@ -1,2 +0,0 @@ -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/dist/ipf/test/regress/ni1.ipf b/dist/ipf/test/regress/ni1.ipf deleted file mode 100644 index c7e5797185dc..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/ni1.nat b/dist/ipf/test/regress/ni1.nat deleted file mode 100644 index 4306f4b45d3d..000000000000 --- a/dist/ipf/test/regress/ni1.nat +++ /dev/null @@ -1 +0,0 @@ -map df0 2.2.2.2/32 -> 6.6.6.6/32 diff --git a/dist/ipf/test/regress/ni2.ipf b/dist/ipf/test/regress/ni2.ipf deleted file mode 100644 index 5956cf9f929c..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/ni2.nat b/dist/ipf/test/regress/ni2.nat deleted file mode 100644 index 4ad73c2ed4b8..000000000000 --- a/dist/ipf/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 diff --git a/dist/ipf/test/regress/ni4.ipf b/dist/ipf/test/regress/ni4.ipf deleted file mode 100644 index c7e5797185dc..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/ni4.nat b/dist/ipf/test/regress/ni4.nat deleted file mode 100644 index 6eefdc2a988f..000000000000 --- a/dist/ipf/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 diff --git a/dist/ipf/test/regress/ni5.ipf b/dist/ipf/test/regress/ni5.ipf deleted file mode 100644 index 8f11424f4c33..000000000000 --- a/dist/ipf/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/dist/ipf/test/regress/ni5.nat b/dist/ipf/test/regress/ni5.nat deleted file mode 100644 index 8e80d2248f19..000000000000 --- a/dist/ipf/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/usr.sbin/ipf/ipftest/Makefile b/usr.sbin/ipf/ipftest/Makefile index 4e07a38a6c6a..c92536e9c2bd 100644 --- a/usr.sbin/ipf/ipftest/Makefile +++ b/usr.sbin/ipf/ipftest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/03/14 12:34:33 martti Exp $ +# $NetBSD: Makefile,v 1.20 2002/05/13 06:35:47 martti Exp $ PROG= ipftest SRCS= ipt.c parse.c common.c fil.c ipft_sn.c ipft_ef.c ipft_td.c \ @@ -8,8 +8,6 @@ SRCS= ipt.c parse.c common.c fil.c ipft_sn.c ipft_ef.c ipft_td.c \ MAN= ipftest.1 CPPFLAGS+=-I${.CURDIR}/../../../dist/ipf -DIPFILTER_LKM -DIPFILTER_LOG -SUBDIR= test - .PATH: ${.CURDIR}/../../../sys/netinet .include .include diff --git a/usr.sbin/ipf/ipftest/test/Makefile b/usr.sbin/ipf/ipftest/test/Makefile deleted file mode 100644 index 3797fbca7252..000000000000 --- a/usr.sbin/ipf/ipftest/test/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2002/04/09 17:17:24 jdolecek Exp $ -# -# (C)opyright 1993-1996 by Darren Reed. -# -# Redistribution and use in source and binary forms are permitted -# provided that this notice is preserved and due credit is given -# to the original author and the contributors. -# -.include - -tests: first ftests ptests ntests - -first: - -mkdir -p results - -# Filtering tests -ftests: f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f14 - -# Rule parsing tests -ptests: i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 - -ntests: n1 n2 n3 n4 n5 n6 n7 - -0: - @(cd ..; ${MAKE} ipftest; ) - -f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f14: - @/bin/sh ${.CURDIR}/dotest $@ ${.CURDIR}/../../../../dist/ipf/test - -f12: - @/bin/sh ${.CURDIR}/hextest $@ ${.CURDIR}/../../../../dist/ipf/test - -i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11: - @/bin/sh ${.CURDIR}/itest $@ ${.CURDIR}/../../../../dist/ipf/test - -n1 n2 n3 n4 n5 n6 n7: - @/bin/sh ${.CURDIR}/nattest $@ ${.CURDIR}/../../../../dist/ipf/test - -clean cleandir: - /bin/rm -f f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f14 - /bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 - /bin/rm -f n1 n2 n3 n4 n5 n6 n7 - -/bin/rm -rf results diff --git a/usr.sbin/ipf/ipftest/test/dotest b/usr.sbin/ipf/ipftest/test/dotest deleted file mode 100644 index d0d2da02b8ad..000000000000 --- a/usr.sbin/ipf/ipftest/test/dotest +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# $NetBSD: dotest,v 1.6 2000/06/12 13:35:52 veego Exp $ -# - -echo "$1..."; -TESTDIR=$2; -[ -z "$2" ] && TESTDIR=$PWD'/../../../../dist/ipf/test'; -/bin/cp /dev/null results/$1 -( while read rule; do - echo "$rule" | ipftest -br - -i $TESTDIR/input/$1 >> results/$1; - if [ $? -ne 0 ] ; then - exit 1; - fi - echo "--------" >> results/$1 -done ) < $TESTDIR/regress/$1 -cmp $TESTDIR/expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - touch $1 -fi -exit $status diff --git a/usr.sbin/ipf/ipftest/test/hextest b/usr.sbin/ipf/ipftest/test/hextest deleted file mode 100644 index 533a5f36cb03..000000000000 --- a/usr.sbin/ipf/ipftest/test/hextest +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# $NetBSD: hextest,v 1.6 2000/06/12 13:35:52 veego Exp $ -# - -echo "$1..."; -TESTDIR=$2; -[ -z "$2" ] && TESTDIR=$PWD'/../../../../dist/ipf/test'; -/bin/cp /dev/null results/$1 -( while read rule; do - echo "$rule" | ipftest -br - -Hi $TESTDIR/input/$1 >> results/$1; - if [ $? -ne 0 ] ; then - exit 1; - fi - echo "--------" >> results/$1 -done ) < $TESTDIR/regress/$1 -cmp $TESTDIR/expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - touch $1 -fi -exit $status diff --git a/usr.sbin/ipf/ipftest/test/itest b/usr.sbin/ipf/ipftest/test/itest deleted file mode 100644 index d2d9346fb1e5..000000000000 --- a/usr.sbin/ipf/ipftest/test/itest +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# $NetBSD: itest,v 1.6 2000/06/12 13:35:53 veego Exp $ -# - -echo "$1..."; -TESTDIR=$2; -[ -z "$2" ] && TESTDIR=$PWD'/../../../../dist/ipf/test'; -/bin/cp /dev/null results/$1 -ipf -nvf $TESTDIR/regress/$1 2>/dev/null > results/$1 -cmp $TESTDIR/expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - touch $1 -fi -exit $status diff --git a/usr.sbin/ipf/ipftest/test/nattest b/usr.sbin/ipf/ipftest/test/nattest deleted file mode 100644 index 31ceb450f264..000000000000 --- a/usr.sbin/ipf/ipftest/test/nattest +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# $NetBSD: nattest,v 1.2 2000/06/12 13:35:54 veego Exp $ -# - -echo "$1..."; -TESTDIR=$2; -[ -z "$2" ] && TESTDIR=$PWD'/../../../../dist/ipf/test'; -/bin/cp /dev/null results/$1 -( while read rule; do - echo "$rule" | ipftest -Nbr - -i $TESTDIR/input/$1 >> results/$1; - if [ $? -ne 0 ] ; then - exit 1; - fi - echo "-------------------------------" >> results/$1 -done ) < $TESTDIR/regress/$1 -cmp $TESTDIR/expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - touch $1 -fi -exit $status