head	1.1;
branch	1.1.1;
access;
symbols
	RELENG_8_4:1.1.1.5.0.18
	RELENG_9_1_0_RELEASE:1.1.1.5
	RELENG_9_1:1.1.1.5.0.16
	RELENG_9_1_BP:1.1.1.5
	RELENG_8_3_0_RELEASE:1.1.1.5
	RELENG_8_3:1.1.1.5.0.14
	RELENG_8_3_BP:1.1.1.5
	RELENG_9_0_0_RELEASE:1.1.1.5
	RELENG_9_0:1.1.1.5.0.12
	RELENG_9_0_BP:1.1.1.5
	RELENG_9:1.1.1.5.0.10
	RELENG_9_BP:1.1.1.5
	RELENG_7_4_0_RELEASE:1.1.1.4.2.1
	RELENG_8_2_0_RELEASE:1.1.1.5
	RELENG_7_4:1.1.1.4.2.1.0.10
	RELENG_7_4_BP:1.1.1.4.2.1
	RELENG_8_2:1.1.1.5.0.8
	RELENG_8_2_BP:1.1.1.5
	RELENG_8_1_0_RELEASE:1.1.1.5
	RELENG_8_1:1.1.1.5.0.6
	RELENG_8_1_BP:1.1.1.5
	RELENG_7_3_0_RELEASE:1.1.1.4.2.1
	RELENG_7_3:1.1.1.4.2.1.0.8
	RELENG_7_3_BP:1.1.1.4.2.1
	RELENG_8_0_0_RELEASE:1.1.1.5
	RELENG_8_0:1.1.1.5.0.4
	RELENG_8_0_BP:1.1.1.5
	RELENG_8:1.1.1.5.0.2
	RELENG_8_BP:1.1.1.5
	RELENG_7_2_0_RELEASE:1.1.1.4.2.1
	RELENG_7_2:1.1.1.4.2.1.0.6
	RELENG_7_2_BP:1.1.1.4.2.1
	RELENG_7_1_0_RELEASE:1.1.1.4.2.1
	RELENG_6_4_0_RELEASE:1.1.1.3.2.2
	RELENG_7_1:1.1.1.4.2.1.0.4
	RELENG_7_1_BP:1.1.1.4.2.1
	RELENG_6_4:1.1.1.3.2.2.0.4
	RELENG_6_4_BP:1.1.1.3.2.2
	RELENG_7_0_0_RELEASE:1.1.1.4.2.1
	RELENG_6_3_0_RELEASE:1.1.1.3.2.2
	RELENG_7_0:1.1.1.4.2.1.0.2
	RELENG_7_0_BP:1.1.1.4.2.1
	RELENG_6_3:1.1.1.3.2.2.0.2
	RELENG_6_3_BP:1.1.1.3.2.2
	v4-1-28:1.1.1.5
	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.3.2.1
	RELENG_6_2:1.1.1.3.2.1.0.2
	RELENG_6_2_BP:1.1.1.3.2.1
	v4-1-13:1.1.1.4
	RELENG_5_5_0_RELEASE:1.1.1.2
	RELENG_5_5:1.1.1.2.0.8
	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.4
	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.6
	RELENG_5_4_BP:1.1.1.2
	RELENG_4_11_0_RELEASE:1.1.1.1.2.2
	RELENG_4_11:1.1.1.1.2.2.0.2
	RELENG_4_11_BP:1.1.1.1.2.2
	RELENG_5_3_0_RELEASE:1.1.1.2
	RELENG_5_3:1.1.1.2.0.4
	RELENG_5_3_BP:1.1.1.2
	RELENG_5:1.1.1.2.0.2
	RELENG_5_BP:1.1.1.2
	v3-4-35:1.1.1.2
	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
	DARRENR:1.1.1;
locks; strict;
comment	@# @;


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

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

1.1.1.2
date	2004.06.21.22.47.51;	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;
next	1.1.1.4;

1.1.1.4
date	2005.12.30.11.34.53;	author guido;	state Exp;
branches
	1.1.1.4.2.1;
next	1.1.1.5;

1.1.1.5
date	2007.10.18.21.41.14;	author darrenr;	state Exp;
branches
	1.1.1.5.18.1;
next	;

1.1.1.1.2.1
date	2002.04.27.17.31.12;	author darrenr;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2004.07.04.09.24.41;	author darrenr;	state Exp;
branches;
next	;

1.1.1.3.2.1
date	2006.08.24.07.37.09;	author guido;	state Exp;
branches;
next	1.1.1.3.2.2;

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

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

1.1.1.5.18.1
date	2007.10.18.21.41.14;	author svnexp;	state dead;
branches;
next	1.1.1.5.18.2;

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


desc
@@


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


1.1.1.1
log
@Import IPFilter 3.4.26

@
text
@@


1.1.1.2
log
@Import ipfilter 3.4.35 onto vendor branch
@
text
@a24 1
map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp
@


1.1.1.3
log
@import ipfilter 4.1.8 into the vendor branch
@
text
@a25 2
map thisisalonginte 0/0 -> 0/32 mssclamp 1452 tag freddyliveshere
map bar0 0/0 -> 0/32 icmpidmap icmp 1000:2000
@


1.1.1.3.2.1
log
@MFC: ipfilter 4.1.13
@
text
@a5 2
map le0 10.0.0.5/0xff000000 -> 1.2.3.4/24
map le0 10.0.0.5/0xff -> 1.2.3.4/24
d12 2
a13 2
map ppp0 192.168.0.0/16 -> 0/32 portmap tcpudp auto
map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/6
a27 1
map ppp0,adsl0 0/0 -> 0/32
@


1.1.1.3.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
@a30 1
map ppp0 from 192.168.0.0/16 to any port = 123 -> 0/32 age 30/1 udp
@


1.1.1.4
log
@Import IP Filter 4.1.10
@
text
@a5 2
map le0 10.0.0.5/0xff000000 -> 1.2.3.4/24
map le0 10.0.0.5/0xff -> 1.2.3.4/24
d12 2
a13 2
map ppp0 192.168.0.0/16 -> 0/32 portmap tcpudp auto
map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/6
a27 1
map ppp0,adsl0 0/0 -> 0/32
@


1.1.1.4.2.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
@a30 1
map ppp0 from 192.168.0.0/16 to any port = 123 -> 0/32 age 30/1 udp
@


1.1.1.5
log
@Import IPFilter 4.1.28
@
text
@a30 1
map ppp0 from 192.168.0.0/16 to any port = 123 -> 0/32 age 30/1 udp
@


1.1.1.5.18.1
log
@file in1 was added on branch RELENG_8_4 on 2013-03-28 13:01:22 +0000
@
text
@d1 31
@


1.1.1.5.18.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 31
map le0 0/0 -> 0/32
map le0 1/32 -> 1/32
map le0 128.0.0.0/1 -> 0/0
map le0 10.0.0.0/8 -> 1.2.3.0/24
map le0 10.0.0.5/8 -> 1.2.3.4/24
map le0 10.0.0.5/0xff000000 -> 1.2.3.4/24
map le0 10.0.0.5/0xff -> 1.2.3.4/24
map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45
map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999
map ppp0 192.168.0.0/16 -> 0/32 portmap udp 20000:29999
map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp 30000:39999
map ppp0 192.168.0.0/16 -> 0/32 portmap tcp auto
map ppp0 192.168.0.0/16 -> 0/32 portmap udp auto
map ppp0 192.168.0.0/16 -> 0/32 portmap tcpudp auto
map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/6
map ppp0 192.168.0.0/16 -> 0/32 proxy port 1010 ftp/tcp
map le0 0/0 -> 0/32 frag
map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag
map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag
map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/tcp frag
map le0 0/0 -> 0/32 age 10
map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 age 10/20
map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 age 30
map le0 0/0 -> 0/32 frag age 10
map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag age 10/20
map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag age 30
map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp
map thisisalonginte 0/0 -> 0/32 mssclamp 1452 tag freddyliveshere
map bar0 0/0 -> 0/32 icmpidmap icmp 1000:2000
map ppp0,adsl0 0/0 -> 0/32
map ppp0 from 192.168.0.0/16 to any port = 123 -> 0/32 age 30/1 udp
@


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


1.1.1.1.2.2
log
@MFC of IPFilter 3.4.35.
@
text
@a24 1
map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp
@


