Commit Graph

27 Commits

Author SHA1 Message Date
Ed Maste
0fcefb433d Update NetBSD Foundation copyrights to 2-clause BSD
The NetBSD Foundation states "Third parties are encouraged to change the
license on any files which have a 4-clause license contributed to the
NetBSD Foundation to a 2-clause license."

This change removes clauses 3 and 4 from copyright / license blocks that
list The NetBSD Foundation as the only copyright holder.

Sponsored by:	The FreeBSD Foundation
2014-03-18 01:40:25 +00:00
Bjoern A. Zeeb
e0bfbfce79 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
2011-06-28 11:57:25 +00:00
Christian S.J. Peron
1a28a37578 Enable closefrom(2) here, as we have supported it for some time now.
Discussed with:	mlaier
MFC after:	2 weeks
2010-08-05 18:49:06 +00:00
Max Laier
551100331f Flatten out the pf userland vendor area 2008-12-10 19:31:42 +00:00
Max Laier
3765fc7d77 Update for libpcap 0.9.8 2007-10-16 02:12:06 +00:00
Max Laier
e298b784dc Lost these during the import. Hand me the pointy hat.
Approved by:	re (implicit)
2007-07-03 14:08:49 +00:00
Max Laier
5ee7cd2107 Commit resolved import of OpenBSD 4.1 pf userland from perforce.
Approved by:	re (kensmith)
2007-07-03 12:30:03 +00:00
Max Laier
67ecd4f3a4 Import pf userland from OpenBSD 4.1 and (for ftp-proxy) libevent 1.3b as
a local lib.
2007-07-03 12:22:02 +00:00
Max Laier
fc515400ab This commit was generated by cvs2svn to compensate for changes in r171169,
which included commits to RCS files with non-trunk default branches.
2007-07-03 12:22:02 +00:00
Max Laier
1a58af5ef7 Constfy errstr as it is in OpenBSD to unbreak the build.
Pointed out by:	Suken Woo, Martin Wilke, Wesley Morgan
2006-03-15 16:28:12 +00:00
Max Laier
8744275265 Use strtonum now that we have it in libc as well. 2006-03-15 00:30:19 +00:00
Christian S.J. Peron
5f305d1bf2 FreeBSD now supports BIOCLOCK. So we can use it now.
Reviewed by:	mlaier
2005-08-23 00:03:58 +00:00
Christian Brueffer
819f8dfa2b More tcpdump 8->1 cleanup.
Approved by:	mlaier
MFC after:	3 days
2005-08-06 13:03:03 +00:00
Max Laier
0baf7c8675 Resolve conflicts created during the import of pf 3.7 Some features are
missing and will be implemented in a second step.  This is functional as is.

Tested by:	freebsd-pf, pfsense.org
Obtained from:	OpenBSD
2005-05-03 16:55:20 +00:00
Max Laier
61a1372b41 Import pf userland from OpenBSD 3.7 (OPENBSD_3_7 as of today) 2005-05-03 16:47:37 +00:00
Max Laier
b1feb7cada This commit was generated by cvs2svn to compensate for changes in r145837,
which included commits to RCS files with non-trunk default branches.
2005-05-03 16:47:37 +00:00
Max Laier
22d6889b4d Make pflogd cope with module unload (and the sudden disappearing of pflog0).
Instead of eating all the available CPU we now shutdown gracefully.

Submitted by:	yongari
MFC after:	3 days
2004-10-05 08:26:34 +00:00
Max Laier
6964e37de4 Make pflogd(8) store pcap_sf_pkthdr instead of MD timeval contaminated
pcap_pkthdr. This makes /var/log/pflog standart compliant on 64bit archs.

OpenBSD has fixed this by changing the bpf timeval to 32bit in the kernel,
so no need to report this over (again).

PR:		bin/71096 (w/ changes)
Submitted by:	Ville-Pertti Keinonen
Tested by:	amd64(submitter), sparc64(yongari), i386(myself)
MFC after:	3 days
2004-08-31 18:04:34 +00:00
Max Laier
22ac3ead26 Commit userland part of pf version 3.5 from OpenBSD (OPENBSD_3_5_BASE). 2004-06-16 23:39:33 +00:00
Max Laier
abff386833 Import userland of pf 3.5 from OpenBSD (OPENBSD_3_5_BASE). 2004-06-16 23:26:00 +00:00
Max Laier
24b10b46ce This commit was generated by cvs2svn to compensate for changes in r130614,
which included commits to RCS files with non-trunk default branches.
2004-06-16 23:26:00 +00:00
David E. O'Brien
a10f530f93 Fix $FreeBSD$ ids. 2004-03-16 17:24:06 +00:00
Max Laier
b83a49e9b9 Fix some style(9) related issues after discussion with/education from bde:
- Add <sys/param.h> and <limits.h> where required (do not depend on other
   headers pulling it in).
 - __dead -> __dead2
 - #if defined() -> #ifdef
 - Remove ugly PRIu64 macros and use %llu w/ (unsigned long long) cast.

All changes looped back to OpenBSD (where applicable) for easier sync in the
future.

Requested by:	bde
Approved by:	bms(mentor)
2004-03-15 13:41:17 +00:00
Max Laier
3178c893b8 Missed those two during the original import. Taken from OpenBSD's util.h
Approved by:	bms(mentor)
2004-02-28 18:35:40 +00:00
Max Laier
6a4fd102a4 This commit was generated by cvs2svn to compensate for changes in r126357,
which included commits to RCS files with non-trunk default branches.
2004-02-28 18:35:40 +00:00
Max Laier
8c8618f5e8 Apply diff from the port.
Rather small diff for the userland (in contrast to the kernel):
 - Some header file location/differences
 - Clean compilation on 64bit arch (identified by bento a long time ago)
 - ALTQ not (yet) available. Leave a switch for patchsets and future ...
 - most files can be used from the vendor branch

Approved by:	bms(in general)
2004-02-28 17:32:53 +00:00
Max Laier
13b9f61009 Vendor import of OpenBSD's pf userland as of OpenBSD 3.4
Approved by: bms(mentor), core(in general)
2004-02-28 16:52:45 +00:00