Merge the projects/pf/head branch, that was worked on for last six months,

into head. The most significant achievements in the new code:

 o Fine grained locking, thus much better performance.
 o Fixes to many problems in pf, that were specific to FreeBSD port.

New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.

  Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:

r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.

I'd like to thank people who participated in early testing:

Tested by:	Florian Smeets <flo freebsd.org>
Tested by:	Chekaluk Vitaly <artemrts ukr.net>
Tested by:	Ben Wilber <ben desync.com>
Tested by:	Ian FREISLICH <ianf cloudseed.co.za>

1 files changed, 0 insertions, 126 deletions

diff --git a/sys/contrib/pf/net/if_pflow.h b/sys/contrib/pf/net/if_pflow.h
deleted file mode 100644
index 35ccbeb..0000000
--- a/sys/contrib/pf/net/if_pflow.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$OpenBSD: if_pflow.h,v 1.5 2009/02/27 11:09:36 gollo Exp $	*/
-
-/*
- * Copyright (c) 2008 Henning Brauer <henning@openbsd.org>
- * Copyright (c) 2008 Joerg Goltermann <jg@osn.de>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-
-#ifndef _NET_IF_PFLOW_H_
-#define	_NET_IF_PFLOW_H_
-
-#define	PFLOW_ID_LEN	sizeof(u_int64_t)
-
-#define	PFLOW_MAXFLOWS 30
-#define	PFLOW_VERSION 5
-#define	PFLOW_ENGINE_TYPE 42
-#define	PFLOW_ENGINE_ID 42
-#define	PFLOW_MAXBYTES 0xffffffff
-#define	PFLOW_TIMEOUT 30
-
-struct pflow_flow {
-	u_int32_t	src_ip;
-	u_int32_t	dest_ip;
-	u_int32_t	nexthop_ip;
-	u_int16_t	if_index_in;
-	u_int16_t	if_index_out;
-	u_int32_t	flow_packets;
-	u_int32_t	flow_octets;
-	u_int32_t	flow_start;
-	u_int32_t	flow_finish;
-	u_int16_t	src_port;
-	u_int16_t	dest_port;
-	u_int8_t	pad1;
-	u_int8_t	tcp_flags;
-	u_int8_t	protocol;
-	u_int8_t	tos;
-	u_int16_t	src_as;
-	u_int16_t	dest_as;
-	u_int8_t	src_mask;
-	u_int8_t	dest_mask;
-	u_int16_t	pad2;
-} __packed;
-
-#ifdef _KERNEL
-
-extern int pflow_ok;
-
-struct pflow_softc {
-	struct ifnet		 sc_if;
-	struct ifnet		*sc_pflow_ifp;
-
-	unsigned int		 sc_count;
-	unsigned int		 sc_maxcount;
-	u_int64_t		 sc_gcounter;
-	struct ip_moptions	 sc_imo;
-#ifdef __FreeBSD__
-	struct callout		 sc_tmo;
-#else
-	struct timeout		 sc_tmo;
-#endif
-	struct in_addr		 sc_sender_ip;
-	u_int16_t		 sc_sender_port;
-	struct in_addr		 sc_receiver_ip;
-	u_int16_t		 sc_receiver_port;
-	struct mbuf		*sc_mbuf;	/* current cumulative mbuf */
-	SLIST_ENTRY(pflow_softc) sc_next;
-};
-
-extern struct pflow_softc	*pflowif;
-
-#endif /* _KERNEL */
-
-struct pflow_header {
-	u_int16_t	version;
-	u_int16_t	count;
-	u_int32_t	uptime_ms;
-	u_int32_t	time_sec;
-	u_int32_t	time_nanosec;
-	u_int32_t	flow_sequence;
-	u_int8_t	engine_type;
-	u_int8_t	engine_id;
-	u_int8_t	reserved1;
-	u_int8_t	reserved2;
-} __packed;
-
-#define	PFLOW_HDRLEN sizeof(struct pflow_header)
-
-struct pflowstats {
-	u_int64_t	pflow_flows;
-	u_int64_t	pflow_packets;
-	u_int64_t	pflow_onomem;
-	u_int64_t	pflow_oerrors;
-};
-
-/*
- * Configuration structure for SIOCSETPFLOW SIOCGETPFLOW
- */
-struct pflowreq {
-	struct in_addr		sender_ip;
-	struct in_addr		receiver_ip;
-	u_int16_t		receiver_port;
-	u_int16_t		addrmask;
-#define	PFLOW_MASK_SRCIP	0x01
-#define	PFLOW_MASK_DSTIP	0x02
-#define	PFLOW_MASK_DSTPRT	0x04
-};
-
-#ifdef _KERNEL
-int export_pflow(struct pf_state *);
-int pflow_sysctl(int *, u_int,  void *, size_t *, void *, size_t);
-#endif /* _KERNEL */
-
-#endif /* _NET_IF_PFLOW_H_ */