#
369277 |
|
16-Feb-2021 |
cy |
MFC 57785538c6e0d7e8ca0f161ab95bae10fd304047 and 1e811efbc591699b872bea42b9de419c373199df:
57785538c6e0d7e8ca0f161ab95bae10fd304047)
Simplify the FreeBSD check using __FreeBSD__ compiler macro.
Rather than rely on __FreeBSD_version, defined in sys/param.h, use __FreeBSD__ defined by the compiler.
Reported by: emaste MFC after: 1 week
(cherry picked from commit 57785538c6e0d7e8ca0f161ab95bae10fd304047)
1e811efbc591699b872bea42b9de419c373199df:
Fix non-IPv6 build post 57785538c6e0d7e8ca0f161ab95bae10fd304047.
57785538c6e0d7e8ca0f161ab95bae10fd304047 change the test for FreeBSD from __FreeBSD_version to __FreeBSD__. However this test was performed before sys/param.h was included, therefore __FreeBSD_version was never defined. As the test was never true opt_random_ip_id.h was never included.
Submitted by: bdragon Reported by: bdragon
(cherry picked from commit 1e811efbc591699b872bea42b9de419c373199df)
Git Hash: 62607e8680e944f89cd7b5b7bca10698c66908b2 Git Author: cy@FreeBSD.org
|
#
369273 |
|
16-Feb-2021 |
cy |
MFC e673debe7db8ba95e4ee3b549d2570e71d19b596:
Simplify BSD macro tests.
All FreeBSD and NetBSD are BSD >= 199306 and have been for a long time.
(cherry picked from commit e673debe7db8ba95e4ee3b549d2570e71d19b596)
Git Hash: ba6bb2487a7e159556d8ef9ba773fb4fa65dd823 Git Author: cy@FreeBSD.org
|
#
369245 |
|
09-Feb-2021 |
git2svn |
MFC 4cd1807c7d2a67b633dd0c0bfde15091543a2514:
Retire the K&R/STD C __P prototype declarations.
In the old days when K&R C and STD C were each in use a workaround (read hack) was required to allow the same code to work on each without modification. All C compilers support STD C. We can finally put the __P prototype to rest.
(cherry picked from commit 4cd1807c7d2a67b633dd0c0bfde15091543a2514)
Git Hash: 0c7a33852aa5cd28a9d9b19b8f8034d60a9cb50f Git Author: cy@FreeBSD.org
|
#
363769 |
|
02-Aug-2020 |
cy |
MFC r363284-r363285, r363670
r363284: pfil_run_hooks() can be called recursively, so we have to define FASTROUTE_RECURSION in fil.c
Submitted by: christos@NetBSD.org Reported by: christos@NetBSD.org Obtained from: NetBSD r1.31
r363285: Fix incorrect byte order in ipfstat -f output. - make sure frag is initialized to 0 - initialize ipfr_p field
NetBSD PR: 55137 Submitted by: christos@NetBSD.org Reported by: christos@NetBSD.org Obtained from: NetBSD fil.c r1.32, ip_frag.c r1.8
r363670: Continued ipfilter #ifdef cleanup. The r343701 log entry contains a complete description.
|
#
344833 |
|
06-Mar-2019 |
cy |
MFC r343701 & r343732:
ipfilter #ifdef cleanup.
Remove #ifdefs for ancient and irrelevant operating systems from ipfilter.
When ipfilter was written the UNIX and UNIX-like systems in use were diverse and plentiful. IRIX, Tru64 (OSF/1) don't exist any more. OpenBSD removed ipfilter shortly after the first time the ipfilter license terms changed in the early 2000's. ipfilter on AIX, HP/UX, and Linux never really caught on. Removal of code for operating systems that ipfilter will never run on again will simplify the code making it easier to fix bugs, complete partially implemented features, and extend ipfilter.
Unsupported previous version FreeBSD code and some older NetBSD code has also been removed.
What remains is supported FreeBSD, NetBSD, and illumos. FreeBSD and NetBSD have collaborated exchanging patches, while illumos has expressed willingness to have their ipfilter updated to 5.1.2, provided their zone-specific updates to their ipfilter are merged (which are of interest to FreeBSD to allow control of ipfilters in jails from the global zone).
Reviewed by: glebius@ Differential Revision: https://reviews.freebsd.org/D19006
|
#
319175 |
|
30-May-2017 |
cy |
MFC r315368:
calloc() and realloc() modernization.
This commit replaces calloc calls, which called calloc() as if it were malloc() by allocating a multiple of objects as a sizeof multiplied by the number of objects. The patch rectifies this by calling calloc() as it was meant to be called.
This commit also replaces realloc() with reallocarray() in a similar fashion as above. Instead of calculating the memory to reallocated (changed) by multiplying sizeof by the number of objects, the sizeof and number are passed as separate arguments to reallocarray(), letting reallocarray() do the multiplication instead. Like the calloc() adjustment above, this is approach is cleaner and more elegant than than the previous code.
This has been tested on my production firewall and a laptop (also running ipfilter).
Submitted by: pfg
|
#
302408 |
|
07-Jul-2016 |
gjb |
Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle. Prune svn:mergeinfo from the new branch, as nothing has been merged here.
Additional commits post-branch will follow.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
288683 |
|
05-Oct-2015 |
ngie |
Revert r288682
I meant to do this on ^/user/ngie/more-tests
Pointyhat to: ngie (use svn info next time...)
|
#
255332 |
|
06-Sep-2013 |
cy |
Update ipfilter 4.1.28 --> 5.1.2.
Approved by: glebius (mentor) BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author)
|
#
180778 |
|
24-Jul-2008 |
darrenr |
2020447 IPFilter's NAT can undo name server random port selection
Approved by: darrenr MFC after: 1 week Security: CERT VU#521769
|
#
180761 |
|
23-Jul-2008 |
des |
For unfathomable reasons, ipfilter abuses kernel data structures for its own purposes. To pull this off, it defines _KERNEL before including the headers where these structures are defined. This leads to no end of trouble when some of these headers, or other headers that they include, change, as demonstrated by r180755.
The quick fix in this particular case is to define _WANT_FILE instead of _KERNEL, conditional on __FreeBSD__. A better long-term fix is left as an exercise to the reader.
|
#
172776 |
|
18-Oct-2007 |
darrenr |
Pullup IPFilter 4.1.28 from the vendor branch into HEAD.
MFC after: 7 days
|
#
170268 |
|
04-Jun-2007 |
darrenr |
Merge IPFilter 4.1.23 back to HEAD See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13
|
#
161357 |
|
16-Aug-2006 |
guido |
Resolve conflicts
MFC after: 1 weeks
|
#
153881 |
|
30-Dec-2005 |
guido |
Resolve conflicts (and believe me...you don't want to know).
|
#
145519 |
|
25-Apr-2005 |
darrenr |
* Someone imported a lot of files with the wrong CVS tag, so lots of files need that fixed in them.... * Keep unnecessary files out of the non-vendor part of this CVS repository.
|
#
110920 |
|
15-Feb-2003 |
darrenr |
bring changes in IPFilter to 3.4.31 on to the head
|
#
109153 |
|
12-Jan-2003 |
dillon |
Bow to the whining masses and change a union back into void *. Retain removal of unnecessary casts and throw in some minor cleanups to see if anyone complains, just for the hell of it.
|
#
109123 |
|
11-Jan-2003 |
dillon |
Change struct file f_data to un_data, a union of the correct struct pointer types, and remove a huge number of casts from code using it.
Change struct xfile xf_data to xun_data (ABI is still compatible).
If we need to add a #define for f_data and xf_data we can, but I don't think it will be necessary. There are no operational changes in this commit.
|
#
92691 |
|
19-Mar-2002 |
darrenr |
fix conflicts generated by import, completing import of ipf3.4.25
|
#
89338 |
|
14-Jan-2002 |
alfred |
Backout inclusion of sys/queue.h
|
#
89331 |
|
14-Jan-2002 |
alfred |
add queue.h, now needed for file.h
|
#
84768 |
|
10-Oct-2001 |
bde |
Compensate for "Compensate for header dethreading" by backing it out.
|
#
80490 |
|
28-Jul-2001 |
darrenr |
fix conflicts created by import
|
#
76170 |
|
01-May-2001 |
markm |
Compensate for dethreaded headers. (I have no religion about how this was done. Follow-up commits welcome)
|
#
72006 |
|
04-Feb-2001 |
darrenr |
fix conflicts
|
#
70033 |
|
14-Dec-2000 |
alfred |
Adapt to new struct kinfo_proc and unbreak world. Apologies to: darrenr who is maintainer
|
#
57109 |
|
10-Feb-2000 |
peter |
Not in this commit: Many spammed deltas have been removed to restore back to the vendor branch.
Re-merge changes from the vendor branch.
Undo the local spammed changes that I could find. There are probably more local fixes that were clobbered that I've missed.
|
#
34752 |
|
21-Mar-1998 |
peter |
Some tweaks to get this to compile for the userland tools.
|
#
34740 |
|
21-Mar-1998 |
peter |
This commit was generated by cvs2svn to compensate for changes in r34739, which included commits to RCS files with non-trunk default branches.
|
#
34739 |
|
21-Mar-1998 |
peter |
Import ipfilter 3.2.3
|
#
31183 |
|
16-Nov-1997 |
peter |
Import ipfilter 3.2.1 (update from 3.1.8)
|
#
24583 |
|
03-Apr-1997 |
darrenr |
Import IP Filter version 3.2alpha4 to bring in working LKM for 2.2
|
#
22514 |
|
09-Feb-1997 |
darrenr |
Import IP Filter v3.1.7 into FreeBSD tree
|