Fix for no state removal if compiled into kernel ... Fwd: svn commit: r226530 - head/sys/contrib/pf/net

[Bjoern A. Zeeb]

Hi,

for all of you.  pfsync will be next.  If you want to fetch the patch, it's also here:
http://people.freebsd.org/~bz/20111019-01-pf-state-removal.diff

I'll make sure it'll be part of RC2.

/bz

Begin forwarded message:

> From: "Bjoern A. Zeeb" <bz at FreeBSD.org>
> Date: 19. October 2011 08:57:17 GMT+00:00
> To: src-committers at freebsd.org, svn-src-all at freebsd.org, svn-src-head at freebsd.org
> Subject: svn commit: r226530 - head/sys/contrib/pf/net
> 
> Author: bz
> Date: Wed Oct 19 08:57:17 2011
> New Revision: 226530
> URL: http://svn.freebsd.org/changeset/base/226530
> 
> Log:
>  Fix a bug when NPFSYNC > 0 that on FreeBSD we would always return
>  and never remove state.
> 
>  This fixes the problem some people are seeing that state is removed when pf
>  is loaded as a module but not in situations when compiled into the kernel.
> 
>  Reported by:	many on freebsd-pf
>  Tested by:	flo
>  MFC after:	3 days
> 
> Modified:
>  head/sys/contrib/pf/net/pf.c
> 
> Modified: head/sys/contrib/pf/net/pf.c
> ==============================================================================
> --- head/sys/contrib/pf/net/pf.c	Wed Oct 19 08:52:14 2011	(r226529)
> +++ head/sys/contrib/pf/net/pf.c	Wed Oct 19 08:57:17 2011	(r226530)
> @@ -1626,8 +1626,8 @@ pf_free_state(struct pf_state *cur)
> 
> #if NPFSYNC > 0
> #ifdef __FreeBSD__
> -	if (pfsync_state_in_use_ptr != NULL)
> -		pfsync_state_in_use_ptr(cur);
> +	if (pfsync_state_in_use_ptr != NULL &&
> +		pfsync_state_in_use_ptr(cur))
> #else
> 	if (pfsync_state_in_use(cur))
> #endif

-- 
Bjoern A. Zeeb                                 You have to have visions!
         Stop bit received. Insert coin for new address family.