Date: Sun, 13 Mar 2005 18:08:56 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_compat.h ip_fil.c ip_frag.c ip_log.c ip_nat.c ip_nat.h ip_proxy.c ip_state.c ip_state.h mlfk_ipl.c Message-ID: <200503131808.j2DI8u0G070360@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rwatson 2005-03-13 18:08:56 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_5)
sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_compat.h
ip_fil.c ip_frag.c ip_log.c
ip_nat.c ip_nat.h ip_proxy.c
ip_state.c ip_state.h mlfk_ipl.c
Log:
Merge a series of changes from HEAD to RELENG_5 that properly enable
fine-grained locking for ipfilter. This is an approximate merge of
several overlapping changes introduced due to build problems with the
original changes, first attempted fixes, second attempted fixes, et al.
ip_auth.c:1.37, ip_compat.h:1.24, ip_frag.c:1.26, ip_log.c:1.28, ip_nat.h:1.22,
ip_proxy.c:1.23, ip_state.c:1.34, ip_state.h:1.16, mlfk_ipl.c:1.14
Enable fine grained locking within IPFilter, using mtx(9) and sx(9) allowing
the the "needs giant" flag to be removed from the driver.
fil.c:1.41, ip_file.c:1.50, ip_fil.h:1.28
Sprinkle in some __FreeBSD_version checks so that this compiles again. Don't
define PFIL_HOOKS anymore.
Submitted by: keramida
|| (__FreeBSD_version >= 503000)
ip_fil.h:1.29
Darnit, through a maze of twisty passages, ipfilter needs to have PFIL_HOOKS
defined. Revert part of the previous commit to fix this.
fil.c:1.42, ip_fil.c:1.51
* The #ifdef's to cause mutex's for freebsd to be declared were meant to pick
up on USE_MUTEX being defined, but this patch
* Remove some code that's in a #ifndef FreeBSD that's no longer used.
ip_auth.c:1.38
* Remove some code that's in a #ifndef FreeBSD that's no longer used.
This collective set of changes should reduce/eliminate reported crashes
associated with ipfilter and SMP configurations.
Timeout: darrenr
Approved by: re (kensmith)
Tested by: nectar
Revision Changes Path
1.39.2.2 +5 -42 src/sys/contrib/ipfilter/netinet/fil.c
1.36.2.1 +2 -7 src/sys/contrib/ipfilter/netinet/ip_auth.c
1.23.2.1 +51 -12 src/sys/contrib/ipfilter/netinet/ip_compat.h
1.47.2.4 +3 -1 src/sys/contrib/ipfilter/netinet/ip_fil.c
1.25.2.1 +2 -2 src/sys/contrib/ipfilter/netinet/ip_frag.c
1.27.2.1 +2 -2 src/sys/contrib/ipfilter/netinet/ip_log.c
1.34.2.4 +2 -2 src/sys/contrib/ipfilter/netinet/ip_nat.c
1.21.2.1 +2 -2 src/sys/contrib/ipfilter/netinet/ip_nat.h
1.22.6.1 +2 -2 src/sys/contrib/ipfilter/netinet/ip_proxy.c
1.33.2.1 +2 -2 src/sys/contrib/ipfilter/netinet/ip_state.c
1.15.2.1 +2 -2 src/sys/contrib/ipfilter/netinet/ip_state.h
1.13.2.1 +25 -10 src/sys/contrib/ipfilter/netinet/mlfk_ipl.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503131808.j2DI8u0G070360>