head	1.1;
branch	1.1.1;
access;
symbols
	RELENG_8_4:1.1.1.4.0.18
	RELENG_9_1_0_RELEASE:1.1.1.4
	RELENG_9_1:1.1.1.4.0.16
	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.14
	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.12
	RELENG_9_0_BP:1.1.1.4
	RELENG_9:1.1.1.4.0.10
	RELENG_9_BP:1.1.1.4
	RELENG_7_4_0_RELEASE:1.1.1.3.10.1
	RELENG_8_2_0_RELEASE:1.1.1.4
	RELENG_7_4:1.1.1.3.10.1.0.10
	RELENG_7_4_BP:1.1.1.3.10.1
	RELENG_8_2:1.1.1.4.0.8
	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.6
	RELENG_8_1_BP:1.1.1.4
	RELENG_7_3_0_RELEASE:1.1.1.3.10.1
	RELENG_7_3:1.1.1.3.10.1.0.8
	RELENG_7_3_BP:1.1.1.3.10.1
	RELENG_8_0_0_RELEASE:1.1.1.4
	RELENG_8_0:1.1.1.4.0.4
	RELENG_8_0_BP:1.1.1.4
	RELENG_8:1.1.1.4.0.2
	RELENG_8_BP:1.1.1.4
	RELENG_7_2_0_RELEASE:1.1.1.3.10.1
	RELENG_7_2:1.1.1.3.10.1.0.6
	RELENG_7_2_BP:1.1.1.3.10.1
	RELENG_7_1_0_RELEASE:1.1.1.3.10.1
	RELENG_6_4_0_RELEASE:1.1.1.3.2.1
	RELENG_7_1:1.1.1.3.10.1.0.4
	RELENG_7_1_BP:1.1.1.3.10.1
	RELENG_6_4:1.1.1.3.2.1.0.4
	RELENG_6_4_BP:1.1.1.3.2.1
	RELENG_7_0_0_RELEASE:1.1.1.3.10.1
	RELENG_6_3_0_RELEASE:1.1.1.3.2.1
	RELENG_7_0:1.1.1.3.10.1.0.2
	RELENG_7_0_BP:1.1.1.3.10.1
	RELENG_6_3:1.1.1.3.2.1.0.2
	RELENG_6_3_BP:1.1.1.3.2.1
	v4-1-28:1.1.1.4
	RELENG_7:1.1.1.3.0.10
	RELENG_7_BP:1.1.1.3
	v4-1-23:1.1.1.3
	RELENG_6_2_0_RELEASE:1.1.1.3
	RELENG_6_2:1.1.1.3.0.8
	RELENG_6_2_BP:1.1.1.3
	v4-1-13:1.1.1.3
	RELENG_5_5_0_RELEASE:1.1.1.2
	RELENG_5_5:1.1.1.2.0.14
	RELENG_5_5_BP:1.1.1.2
	RELENG_6_1_0_RELEASE:1.1.1.3
	RELENG_6_1:1.1.1.3.0.6
	RELENG_6_1_BP:1.1.1.3
	v4-1-10:1.1.1.3
	RELENG_6_0_0_RELEASE:1.1.1.3
	RELENG_6_0:1.1.1.3.0.4
	RELENG_6_0_BP:1.1.1.3
	RELENG_6:1.1.1.3.0.2
	RELENG_6_BP:1.1.1.3
	RELENG_5_4_0_RELEASE:1.1.1.2
	v4-1-8:1.1.1.3
	RELENG_5_4:1.1.1.2.0.12
	RELENG_5_4_BP:1.1.1.2
	RELENG_4_11_0_RELEASE:1.1.1.1.6.1
	RELENG_4_11:1.1.1.1.6.1.0.18
	RELENG_4_11_BP:1.1.1.1.6.1
	RELENG_5_3_0_RELEASE:1.1.1.2
	RELENG_5_3:1.1.1.2.0.10
	RELENG_5_3_BP:1.1.1.2
	RELENG_5:1.1.1.2.0.8
	RELENG_5_BP:1.1.1.2
	v3-4-35:1.1.1.2
	RELENG_4_10_0_RELEASE:1.1.1.1.6.1
	RELENG_4_10:1.1.1.1.6.1.0.16
	RELENG_4_10_BP:1.1.1.1.6.1
	RELENG_5_2_1_RELEASE:1.1.1.2
	RELENG_5_2_0_RELEASE:1.1.1.2
	RELENG_5_2:1.1.1.2.0.6
	RELENG_5_2_BP:1.1.1.2
	RELENG_4_9_0_RELEASE:1.1.1.1.6.1
	RELENG_4_9:1.1.1.1.6.1.0.14
	RELENG_4_9_BP:1.1.1.1.6.1
	RELENG_5_1_0_RELEASE:1.1.1.2
	RELENG_5_1:1.1.1.2.0.4
	RELENG_5_1_BP:1.1.1.2
	RELENG_4_8_0_RELEASE:1.1.1.1.6.1
	RELENG_4_8:1.1.1.1.6.1.0.12
	RELENG_4_8_BP:1.1.1.1.6.1
	v3-4-31:1.1.1.2
	RELENG_5_0_0_RELEASE:1.1.1.2
	RELENG_5_0:1.1.1.2.0.2
	RELENG_5_0_BP:1.1.1.2
	RELENG_4_7_0_RELEASE:1.1.1.1.6.1
	RELENG_4_7:1.1.1.1.6.1.0.10
	RELENG_4_7_BP:1.1.1.1.6.1
	v3-4-29:1.1.1.2
	RELENG_4_6_2_RELEASE:1.1.1.1.6.1
	RELENG_4_6_1_RELEASE:1.1.1.1.6.1
	RELENG_4_6_0_RELEASE:1.1.1.1.6.1
	v3-4-28:1.1.1.2
	RELENG_4_6:1.1.1.1.6.1.0.8
	RELENG_4_6_BP:1.1.1.1.6.1
	v3-4-27:1.1.1.2
	v3-4-26:1.1.1.2
	v3-4-25:1.1.1.2
	RELENG_4_5_0_RELEASE:1.1.1.1.6.1
	RELENG_4_5:1.1.1.1.6.1.0.6
	RELENG_4_5_BP:1.1.1.1.6.1
	RELENG_4_4_0_RELEASE:1.1.1.1.6.1
	RELENG_4_4:1.1.1.1.6.1.0.4
	RELENG_4_4_BP:1.1.1.1.6.1
	v3-4-20:1.1.1.2
	RELENG_4_3_0_RELEASE:1.1.1.1.6.1
	RELENG_4_3:1.1.1.1.6.1.0.2
	RELENG_4_3_BP:1.1.1.1.6.1
	v3-4-16:1.1.1.2
	rev:1.1.1.2
	RELENG_4_2_0_RELEASE:1.1.1.1.6.1
	v3-4-13:1.1.1.2
	v3-4-12:1.1.1.2
	RELENG_4_1_1_RELEASE:1.1.1.1.6.1
	PRE_SMPNG:1.1.1.2
	v3-4-9:1.1.1.2
	RELENG_4_1_0_RELEASE:1.1.1.1.6.1
	v3-4-8:1.1.1.2
	RELENG_3_5_0_RELEASE:1.1.1.1
	v3_4_4:1.1.1.2
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.6
	RELENG_4_BP:1.1.1.1
	v3_3_8:1.1.1.1
	v3_3_6:1.1.1.1
	RELENG_3_4_0_RELEASE:1.1.1.1
	v3_3_3:1.1.1.1
	RELENG_3_3_0_RELEASE:1.1.1.1
	RELENG_3_2_PAO:1.1.1.1.0.4
	RELENG_3_2_PAO_BP:1.1.1.1
	RELENG_3_2_0_RELEASE:1.1.1.1
	RELENG_3_1_0_RELEASE:1.1.1.1
	RELENG_3:1.1.1.1.0.2
	RELENG_3_BP:1.1.1.1
	RELENG_3_0_0_RELEASE:1.1.1.1
	v3_2_7:1.1.1.1
	v3_2_3:1.1.1.1
	v3_2_1:1.1.1.1
	v3-2-a7:1.1.1.1
	V3_2_A4:1.1.1.1
	ipfilter3_1_8:1.1.1.1
	DARRENR:1.1.1
	ipfilter3_1_7:1.1.1.1
	DARRENREED:1.1.1;
locks; strict;
comment	@# @;


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

1.1.1.1
date	97.02.09.22.50.16;	author darrenr;	state Exp;
branches
	1.1.1.1.6.1;
next	1.1.1.2;

1.1.1.2
date	2000.05.24.02.14.21;	author darrenr;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2005.04.25.17.31.35;	author darrenr;	state Exp;
branches
	1.1.1.3.2.1
	1.1.1.3.10.1;
next	1.1.1.4;

1.1.1.4
date	2007.10.18.21.41.15;	author darrenr;	state Exp;
branches
	1.1.1.4.18.1;
next	;

1.1.1.1.6.1
date	2000.07.19.23.00.52;	author darrenr;	state Exp;
branches;
next	;

1.1.1.3.2.1
date	2007.11.18.11.03.26;	author darrenr;	state Exp;
branches;
next	;

1.1.1.3.10.1
date	2007.10.31.05.00.36;	author darrenr;	state Exp;
branches;
next	;

1.1.1.4.18.1
date	2007.10.18.21.41.15;	author svnexp;	state dead;
branches;
next	1.1.1.4.18.2;

1.1.1.4.18.2
date	2013.03.28.13.01.22;	author svnexp;	state Exp;
branches;
next	;


desc
@@


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


1.1.1.1
log
@Import IP Filter v3.1.7 into FreeBSD tree
@
text
@@


1.1.1.1.6.1
log
@actually commit merged diffs to the trunk
@
text
@a8 2
block in log level auth.info on hme0 all
log level local5.warn out all
@


1.1.1.2
log
@Import IP Filter 3.4.4 into FreeBSD-current
@
text
@a8 2
block in log level auth.info on hme0 all
log level local5.warn out all
@


1.1.1.3
log
@import ipfilter 4.1.8 into the vendor branch
@
text
@d2 1
a2 3
pass in from 128.16/16 to 129.10.10/24
pass in from 128.0.0.1/24 to 128\
.0.0.1/16
@


1.1.1.3.2.1
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
@d3 2
a4 4
pass in from 128.0.0.1/24 to 1\
28\
.\
0.0.1/16
@


1.1.1.3.10.1
log
@MFC the following:
Apply a few changes from ipfilter-current:
* Do not hold any locks over calls to copyin/copyout.
* Clean up some #ifdefs
* fix a possible mbuf leak when NAT fails on policy routed packets

PR:		117216
Approved by:	re
@
text
@d3 2
a4 4
pass in from 128.0.0.1/24 to 1\
28\
.\
0.0.1/16
@


1.1.1.4
log
@Import IPFilter 4.1.28
@
text
@d3 2
a4 4
pass in from 128.0.0.1/24 to 1\
28\
.\
0.0.1/16
@


1.1.1.4.18.1
log
@file i3 was added on branch RELENG_8_4 on 2013-03-28 13:01:22 +0000
@
text
@d1 14
@


1.1.1.4.18.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 14
log in all
pass in from 128.16/16 to 129.10.10/24
pass in from 128.0.0.1/24 to 1\
28\
.\
0.0.1/16
pass in from 128.0.0.1/0xffffff00 to 128.0.0.1/0xffff0000
pass in from 128.0.0.1/255.255.255.0 to 128.0.0.1/255.255.0.0
pass in from 128.0.0.1 mask 0xffffff00 to 128.0.0.1 mask 0xffff0000
pass in from 128.0.0.1 mask 255.255.255.0 to 128.0.0.1 mask 255.255.0.0
pass in from localhost to localhost
block in log from 0/0 to 0/0
block in log level auth.info on hme0 all
log level local5.warn out all
@


