head	1.1;
branch	1.1.1;
access;
symbols
	RELENG_8_4:1.1.1.4.0.30
	RELENG_9_1_0_RELEASE:1.1.1.4
	RELENG_9_1:1.1.1.4.0.28
	RELENG_9_1_BP:1.1.1.4
	RELENG_8_3_0_RELEASE:1.1.1.4
	RELENG_8_3:1.1.1.4.0.26
	RELENG_8_3_BP:1.1.1.4
	RELENG_9_0_0_RELEASE:1.1.1.4
	RELENG_9_0:1.1.1.4.0.24
	RELENG_9_0_BP:1.1.1.4
	RELENG_9:1.1.1.4.0.22
	RELENG_9_BP:1.1.1.4
	RELENG_7_4_0_RELEASE:1.1.1.4
	RELENG_8_2_0_RELEASE:1.1.1.4
	RELENG_7_4:1.1.1.4.0.20
	RELENG_7_4_BP:1.1.1.4
	RELENG_8_2:1.1.1.4.0.18
	RELENG_8_2_BP:1.1.1.4
	RELENG_8_1_0_RELEASE:1.1.1.4
	RELENG_8_1:1.1.1.4.0.16
	RELENG_8_1_BP:1.1.1.4
	RELENG_7_3_0_RELEASE:1.1.1.4
	RELENG_7_3:1.1.1.4.0.14
	RELENG_7_3_BP:1.1.1.4
	RELENG_8_0_0_RELEASE:1.1.1.4
	RELENG_8_0:1.1.1.4.0.12
	RELENG_8_0_BP:1.1.1.4
	RELENG_8:1.1.1.4.0.10
	RELENG_8_BP:1.1.1.4
	RELENG_7_2_0_RELEASE:1.1.1.4
	RELENG_7_2:1.1.1.4.0.8
	RELENG_7_2_BP:1.1.1.4
	RELENG_7_1_0_RELEASE:1.1.1.4
	RELENG_6_4_0_RELEASE:1.1.1.2.2.2
	RELENG_7_1:1.1.1.4.0.6
	RELENG_7_1_BP:1.1.1.4
	RELENG_6_4:1.1.1.2.2.2.0.4
	RELENG_6_4_BP:1.1.1.2.2.2
	RELENG_7_0_0_RELEASE:1.1.1.4
	RELENG_6_3_0_RELEASE:1.1.1.2.2.2
	RELENG_7_0:1.1.1.4.0.4
	RELENG_7_0_BP:1.1.1.4
	RELENG_6_3:1.1.1.2.2.2.0.2
	RELENG_6_3_BP:1.1.1.2.2.2
	v4-1-28:1.1.1.4
	RELENG_7:1.1.1.4.0.2
	RELENG_7_BP:1.1.1.4
	v4-1-23:1.1.1.4
	RELENG_6_2_0_RELEASE:1.1.1.2.2.1
	RELENG_6_2:1.1.1.2.2.1.0.2
	RELENG_6_2_BP:1.1.1.2.2.1
	v4-1-13:1.1.1.3
	RELENG_5_5_0_RELEASE:1.1.1.1
	RELENG_5_5:1.1.1.1.0.16
	RELENG_5_5_BP:1.1.1.1
	RELENG_6_1_0_RELEASE:1.1.1.2
	RELENG_6_1:1.1.1.2.0.6
	RELENG_6_1_BP:1.1.1.2
	v4-1-10:1.1.1.3
	RELENG_6_0_0_RELEASE:1.1.1.2
	RELENG_6_0:1.1.1.2.0.4
	RELENG_6_0_BP:1.1.1.2
	RELENG_6:1.1.1.2.0.2
	RELENG_6_BP:1.1.1.2
	RELENG_5_4_0_RELEASE:1.1.1.1
	v4-1-8:1.1.1.2
	RELENG_5_4:1.1.1.1.0.14
	RELENG_5_4_BP:1.1.1.1
	RELENG_4_11_0_RELEASE:1.1.1.1.2.1
	RELENG_4_11:1.1.1.1.2.1.0.12
	RELENG_4_11_BP:1.1.1.1.2.1
	RELENG_5_3_0_RELEASE:1.1.1.1
	RELENG_5_3:1.1.1.1.0.12
	RELENG_5_3_BP:1.1.1.1
	RELENG_5:1.1.1.1.0.10
	RELENG_5_BP:1.1.1.1
	v3-4-35:1.1.1.1
	RELENG_4_10_0_RELEASE:1.1.1.1.2.1
	RELENG_4_10:1.1.1.1.2.1.0.10
	RELENG_4_10_BP:1.1.1.1.2.1
	RELENG_5_2_1_RELEASE:1.1.1.1
	RELENG_5_2_0_RELEASE:1.1.1.1
	RELENG_5_2:1.1.1.1.0.8
	RELENG_5_2_BP:1.1.1.1
	RELENG_4_9_0_RELEASE:1.1.1.1.2.1
	RELENG_4_9:1.1.1.1.2.1.0.8
	RELENG_4_9_BP:1.1.1.1.2.1
	RELENG_5_1_0_RELEASE:1.1.1.1
	RELENG_5_1:1.1.1.1.0.6
	RELENG_5_1_BP:1.1.1.1
	RELENG_4_8_0_RELEASE:1.1.1.1.2.1
	RELENG_4_8:1.1.1.1.2.1.0.6
	RELENG_4_8_BP:1.1.1.1.2.1
	v3-4-31:1.1.1.1
	RELENG_5_0_0_RELEASE:1.1.1.1
	RELENG_5_0:1.1.1.1.0.4
	RELENG_5_0_BP:1.1.1.1
	RELENG_4_7_0_RELEASE:1.1.1.1.2.1
	RELENG_4_7:1.1.1.1.2.1.0.4
	RELENG_4_7_BP:1.1.1.1.2.1
	v3-4-29:1.1.1.1
	RELENG_4_6_2_RELEASE:1.1.1.1.2.1
	RELENG_4_6_1_RELEASE:1.1.1.1.2.1
	RELENG_4_6_0_RELEASE:1.1.1.1.2.1
	v3-4-28:1.1.1.1
	RELENG_4_6:1.1.1.1.2.1.0.2
	RELENG_4_6_BP:1.1.1.1.2.1
	RELENG_4:1.1.1.1.0.2
	v3-4-27:1.1.1.1
	v3-4-26:1.1.1.1
	v3-4-25:1.1.1.1
	DARRENR:1.1.1;
locks; strict;
comment	@# @;


1.1
date	2002.03.19.11.45.20;	author darrenr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2002.03.19.11.45.20;	author darrenr;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2005.04.25.17.31.26;	author darrenr;	state Exp;
branches
	1.1.1.2.2.1;
next	1.1.1.3;

1.1.1.3
date	2005.12.30.11.34.53;	author guido;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2007.06.04.02.48.37;	author darrenr;	state Exp;
branches
	1.1.1.4.30.1;
next	;

1.1.1.1.2.1
date	2002.04.27.17.31.02;	author darrenr;	state Exp;
branches;
next	;

1.1.1.2.2.1
date	2006.08.24.07.37.08;	author guido;	state Exp;
branches;
next	1.1.1.2.2.2;

1.1.1.2.2.2
date	2007.11.18.11.03.24;	author darrenr;	state Exp;
branches;
next	;

1.1.1.4.30.1
date	2007.06.04.02.48.37;	author svnexp;	state dead;
branches;
next	1.1.1.4.30.2;

1.1.1.4.30.2
date	2013.03.28.13.01.21;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Initial revision
@
text
@#!/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
@


1.1.1.1
log
@Import IPFilter 3.4.25

@
text
@@


1.1.1.2
log
@import ipfilter 4.1.8 into the vendor branch
@
text
@a1 11
mode=$1
shift
if [ $3 = hex ] ; then
	format="-xF $2"
else
	format="-F $2"
fi
if [ "$4" != "" ] ; then
	format="-T $4 $format"
fi
mkdir -p results
d13 5
a17 24

case $mode in
single)
	echo "$1...";
	/bin/cp /dev/null results/$1
	( while read rule; do
		echo "$rule" | ../ipftest -R $format -bx -r regress/$1.ipf -N - -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
	;;
multi)
	echo "$1...";
	/bin/cp /dev/null results/$1
	../ipftest -R $format -bx -r regress/$1.ipf -N regress/$1.nat \
		-i input/$1 >> results/$1;
d19 1
a19 1
		exit 2;
d22 6
a27 7
	cmp expected/$1 results/$1
	status=$?
	if [ $status = 0 ] ; then
		$TOUCH $1
	fi
	;;
esac
@


1.1.1.2.2.1
log
@MFC: ipfilter 4.1.13
@
text
@d30 1
a30 1
		echo "$rule" | ../ipftest -R $format -b -r regress/$1.ipf -N - -i input/$1 >> \
d46 1
a46 1
	../ipftest -R $format -b -r regress/$1.ipf -N regress/$1.nat \
@


1.1.1.2.2.2
log
@MFC IPFilter update from 4.1.13 to 4.1.28, including additional fixes applied
post 4.1.28 for FreeBSD.  See src/contrib/ipfilter/HISTORY for more details
of the bugs fixed, etc.
@
text
@a2 3
name=$2
input=$3
output=$4
d4 2
a5 2
if [ $output = hex ] ; then
	format="-xF $input"
d7 4
a10 1
	format="-F $input"
a11 12
shift
shift
shift
while [ $# -ge 1 ] ; do
	l=`echo $1 | cut -c1`
	if [ "$l" = "-" ] ; then
		format="$format $1"
	else
		format="-T $1 $format"
	fi
	shift
done
d27 2
a28 2
	echo "$name...";
	/bin/cp /dev/null results/$name
d30 2
a31 2
		echo "$rule" | ../ipftest -R $format -b -r regress/$name.ipf -N - -i input/$name >> \
			results/$name;
d35 3
a37 3
		echo "-------------------------------" >> results/$name
	done ) < regress/$name.nat
	cmp expected/$name results/$name
d40 1
a40 1
		$TOUCH $name
d44 4
a47 4
	echo "$name...";
	/bin/cp /dev/null results/$name
	../ipftest -R $format -b -r regress/$name.ipf -N regress/$name.nat \
		-i input/$name >> results/$name;
d51 2
a52 2
	echo "-------------------------------" >> results/$name
	cmp expected/$name results/$name
d55 1
a55 1
		$TOUCH $name
@


1.1.1.3
log
@Import IP Filter 4.1.10
@
text
@d30 1
a30 1
		echo "$rule" | ../ipftest -R $format -b -r regress/$1.ipf -N - -i input/$1 >> \
d46 1
a46 1
	../ipftest -R $format -b -r regress/$1.ipf -N regress/$1.nat \
@


1.1.1.4
log
@Import IPFilter 4.1.23 to vendor branch.
See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13
@
text
@a2 3
name=$2
input=$3
output=$4
d4 2
a5 2
if [ $output = hex ] ; then
	format="-xF $input"
d7 4
a10 1
	format="-F $input"
a11 12
shift
shift
shift
while [ $# -ge 1 ] ; do
	l=`echo $1 | cut -c1`
	if [ "$l" = "-" ] ; then
		format="$format $1"
	else
		format="-T $1 $format"
	fi
	shift
done
d27 2
a28 2
	echo "$name...";
	/bin/cp /dev/null results/$name
d30 2
a31 2
		echo "$rule" | ../ipftest -R $format -b -r regress/$name.ipf -N - -i input/$name >> \
			results/$name;
d35 3
a37 3
		echo "-------------------------------" >> results/$name
	done ) < regress/$name.nat
	cmp expected/$name results/$name
d40 1
a40 1
		$TOUCH $name
d44 4
a47 4
	echo "$name...";
	/bin/cp /dev/null results/$name
	../ipftest -R $format -b -r regress/$name.ipf -N regress/$name.nat \
		-i input/$name >> results/$name;
d51 2
a52 2
	echo "-------------------------------" >> results/$name
	cmp expected/$name results/$name
d55 1
a55 1
		$TOUCH $name
@


1.1.1.4.30.1
log
@file natipftest was added on branch RELENG_8_4 on 2013-03-28 13:01:21 +0000
@
text
@d1 71
@


1.1.1.4.30.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 71
#!/bin/sh
mode=$1
name=$2
input=$3
output=$4
shift
if [ $output = hex ] ; then
	format="-xF $input"
else
	format="-F $input"
fi
shift
shift
shift
while [ $# -ge 1 ] ; do
	l=`echo $1 | cut -c1`
	if [ "$l" = "-" ] ; then
		format="$format $1"
	else
		format="-T $1 $format"
	fi
	shift
done
mkdir -p results
if [ -f /usr/ucb/touch ] ; then
	TOUCH=/usr/ucb/touch
else
	if [ -f /usr/bin/touch ] ; then
		TOUCH=/usr/bin/touch
	else
		if [ -f /bin/touch ] ; then
			TOUCH=/bin/touch
		fi
	fi
fi

case $mode in
single)
	echo "$name...";
	/bin/cp /dev/null results/$name
	( while read rule; do
		echo "$rule" | ../ipftest -R $format -b -r regress/$name.ipf -N - -i input/$name >> \
			results/$name;
		if [ $? -ne 0 ] ; then
			exit 1;
		fi
		echo "-------------------------------" >> results/$name
	done ) < regress/$name.nat
	cmp expected/$name results/$name
	status=$?
	if [ $status = 0 ] ; then
		$TOUCH $name
	fi
	;;
multi)
	echo "$name...";
	/bin/cp /dev/null results/$name
	../ipftest -R $format -b -r regress/$name.ipf -N regress/$name.nat \
		-i input/$name >> results/$name;
	if [ $? -ne 0 ] ; then
		exit 2;
	fi
	echo "-------------------------------" >> results/$name
	cmp expected/$name results/$name
	status=$?
	if [ $status = 0 ] ; then
		$TOUCH $name
	fi
	;;
esac
exit $status
@


1.1.1.1.2.1
log
@Update (finally) IPFilter on RELENG_4 CVS branch.
@
text
@@

