head	1.7;
access;
symbols
	RELENG_9_1_0_RELEASE:1.4.2.2.2.2
	RELENG_9_1:1.4.2.2.0.2
	RELENG_9_1_BP:1.4.2.2
	RELENG_9_0_0_RELEASE:1.4.2.1.2.1
	RELENG_9_0:1.4.2.1.0.2
	RELENG_9_0_BP:1.4.2.1
	RELENG_9:1.4.0.2
	RELENG_9_BP:1.4;
locks; strict;
comment	@# @;


1.7
date	2012.11.17.01.52.59;	author svnexp;	state Exp;
branches;
next	1.6;

1.6
date	2012.09.14.11.51.49;	author glebius;	state Exp;
branches;
next	1.5;

1.5
date	2011.12.22.18.31.47;	author glebius;	state Exp;
branches;
next	1.4;

1.4
date	2011.06.28.11.57.25;	author bz;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2004.06.16.22.59.06;	author mlaier;	state dead;
branches;
next	1.2;

1.2
date	2004.04.06.15.12.50;	author mlaier;	state Exp;
branches;
next	1.1;

1.1
date	2004.02.26.03.53.53;	author mlaier;	state Exp;
branches;
next	;

1.4.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.4.2.1.2.1;
next	1.4.2.2;

1.4.2.2
date	2012.01.07.11.01.35;	author glebius;	state Exp;
branches
	1.4.2.2.2.1;
next	1.4.2.3;

1.4.2.3
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.4.2.1.2.2;

1.4.2.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.4.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.4.2.2.2.2;

1.4.2.2.2.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/pfsync/Makefile 240494 2012-09-14 11:51:49Z glebius $

.include <bsd.own.mk>

.PATH: ${.CURDIR}/../../netpfil/pf

KMOD=	pfsync
SRCS=	if_pfsync.c \
	opt_pf.h opt_inet.h opt_inet6.h
SRCS+=	bus_if.h device_if.h

.if defined(KERNBUILDDIR)
MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
.else
.if ${MK_INET_SUPPORT} != "no"
opt_inet.h:
	echo "#define INET 1" > ${.TARGET}
.endif

.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif

.if defined(VIMAGE)
opt_global.h:
	echo "#define VIMAGE 1" >> ${.TARGET}
CFLAGS+=	-include opt_global.h
MKDEP+=		-include opt_global.h
.endif
.endif

.include <bsd.kmod.mk>
@


1.6
log
@SVN rev 240494 on 2012-09-14 11:51:49Z by glebius

o Create directory sys/netpfil, where all packet filters should
  reside, and move there ipfw(4) and pf(4).

o Move most modified parts of pf out of contrib.

Actual movements:

sys/contrib/pf/net/*.c		-> sys/netpfil/pf/
sys/contrib/pf/net/*.h		-> sys/net/
contrib/pf/pfctl/*.c		-> sbin/pfctl
contrib/pf/pfctl/*.h		-> sbin/pfctl
contrib/pf/pfctl/pfctl.8	-> sbin/pfctl
contrib/pf/pfctl/*.4		-> share/man/man4
contrib/pf/pfctl/*.5		-> share/man/man5

sys/netinet/ipfw		-> sys/netpfil/ipfw

The arguable movement is pf/net/*.h -> sys/net. There are
future plans to refactor pf includes, so I decided not to
break things twice.

Not modified bits of pf left in contrib: authpf, ftp-proxy,
tftp-proxy, pflogd.

The ipfw(4) movement is planned to be merged to stable/9,
to make head and stable match.

Discussed with:		bz, luigi
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.5
log
@SVN rev 228811 on 2011-12-22 18:31:47Z by glebius

In FreeBSD we always have bpf(4) API, either real or stub. No need
in detecting presense of 'device bpf'.
@
text
@d5 1
a5 1
.PATH: ${.CURDIR}/../../contrib/pf/net
a9 2

CFLAGS+= -I${.CURDIR}/../../contrib/pf
@


1.4
log
@SVN rev 223637 on 2011-06-28 11:57:25Z by bz

Update packet filter (pf) code to OpenBSD 4.5.

You need to update userland (world and ports) tools
to be in sync with the kernel.

Submitted by:	mlaier
Submitted by:	eri
@
text
@d9 1
a9 1
	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
a26 3
opt_bpf.h:
	echo "#define DEV_BPF 1" > ${.TARGET}

@


1.4.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.2
log
@SVN rev 229770 on 2012-01-07 11:01:35Z by glebius

Merge from head/ 228732,228811,228813-228816,228855:

  r228732 | glebius | 2011-12-20 16:34:16 +0400 (вт, 20 дек 2011) | 3 lines

  - Cover pfsync callouts deletion with PF_LOCK().
  - Cover setting up interface between pf and pfsync with PF_LOCK().

  r228811 | glebius | 2011-12-22 22:31:47 +0400 (чт, 22 дек 2011) | 3 lines

  In FreeBSD we always have bpf(4) API, either real or stub. No need
  in detecting presense of 'device bpf'.

  r228813 | glebius | 2011-12-22 22:51:35 +0400 (чт, 22 дек 2011) | 2 lines

  We really mean MTU of the real interface here, not of our pseudo.

  r228814 | glebius | 2011-12-22 22:56:27 +0400 (чт, 22 дек 2011) | 16 lines

  Merge couple more fixes from OpenBSD to bulk processing:

    revision 1.118
    date: 2009/03/23 06:19:59;  author: dlg;  state: Exp;  lines: +8 -6
    wait an appropriate amount of time before giving up on a bulk update,
    rather than giving up after a hardcoded 5 seconds (which is generally much
    too short an interval for a bulk update).
    pointed out by david@@, eyeballed by mcbride@@

    revision 1.171
    date: 2011/10/31 22:02:52;  author: mikeb;  state: Exp;  lines: +2 -1
    Don't forget to cancel bulk update failure timeout when destroying an
    interface.  Problem report and fix from Erik Lax, thanks!

  Start a brief note of revisions merged from OpenBSD.

  r228815 | glebius | 2011-12-22 23:05:58 +0400 (чт, 22 дек 2011) | 12 lines

  Merge from OpenBSD:
    revision 1.120
    date: 2009/04/04 13:09:29;  author: dlg;  state: Exp;  lines: +5 -5
    use time_uptime instead of time_second internally. time_uptime isnt
    affected by adjusting the clock.

    revision 1.175
    date: 2011/11/25 12:52:10;  author: dlg;  state: Exp;  lines: +3 -3
    use time_uptime to set state creation values as time_second can be
    skewed at runtime by things like date(1) and ntpd. time_uptime is
    monotonic and therefore more useful to compare against.

  r228816 | glebius | 2011-12-22 23:09:55 +0400 (чт, 22 дек 2011) | 11 lines

  Merge from OpenBSD:
    revision 1.122
    date: 2009/05/13 01:01:34;  author: dlg;  state: Exp;  lines: +6 -4
    only keep track of the number of updates on tcp connections. state sync on
    all the other protocols is simply pushing the timeouts along which has a
    resolution of 1 second, so it isnt going to be hurt by pfsync taking up
    to a second to send it over.

    keep track of updates on tcp still though, their windows need constant
    attention.
@
text
@d9 1
a9 1
	opt_pf.h opt_inet.h opt_inet6.h
d27 3
@


1.4.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/pfsync/Makefile 229770 2012-01-07 11:01:35Z glebius $
@


1.4.2.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.4.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/pfsync/Makefile 229770 2012-01-07 11:01:35Z glebius $
@


1.4.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/pfsync/Makefile 223637 2011-06-28 11:57:25Z bz $
@


1.3
log
@Prepare for pf 3.5 import:
 - Remove pflog and pfsync modules. Things will change in such a fashion
   that there will be one module with pf+pflog that can be loaded into
   GENERIC without problems (which is what most people want). pfsync is no
   longer possible as a module.
 - Add multicast address for in-kernel multicast pfsync protocol. Protocol
   glue will follow once the import is done.
 - Add one more mbuf tag
@
text
@d1 3
a3 1
# $FreeBSD: src/sys/modules/pfsync/Makefile,v 1.2 2004/04/06 15:12:50 mlaier Exp $
d8 1
a8 1
SRCS = 	if_pfsync.c \
d11 2
a12 6
CFLAGS+=  -Wall -I${.CURDIR}/../../contrib/pf

opt_pf.h:
	echo "#define DEV_PF 1" > opt_pf.h
	echo "#define DEV_PFLOG 1" >> opt_pf.h
	echo "#define DEV_PFSYNC 1" >> opt_pf.h
d14 4
d19 2
a20 1
	echo "#define INET 1" > opt_inet.h
d22 1
d24 1
a24 4
.if defined(NOINET6)
	echo > opt_inet6.h
.else
	echo "#define INET6 1" > opt_inet6.h
d28 9
a36 1
	echo "#define DEV_BPF 1" > opt_bpf.h
@


1.2
log
@Make pf* modules respect NOINET6 from make.conf(5) in order to build them
for INET6-less kernel.

Requested by:	many
Approved by:	bms(mentor)
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1
log
@Tweak existing header and other build infrastructure to be able to build
pf/pflog/pfsync as modules. Do not list them in NOTES or modules/Makefile
(i.e. do not connect it to any (automatic) builds - yet).

Approved by: bms(mentor)
@
text
@d20 3
d24 1
@

