Date: Wed, 19 Oct 2011 09:00:58 +0000 From: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> To: freebsd-pf@freebsd.org Subject: Fix for no state removal if compiled into kernel ... Fwd: svn commit: r226530 - head/sys/contrib/pf/net Message-ID: <A9A739C5-17A7-483E-833C-6C7D8FDF7FCA@lists.zabbadoz.net> References: <201110190857.p9J8vHBJ013030@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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@FreeBSD.org> > Date: 19. October 2011 08:57:17 GMT+00:00 > To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A9A739C5-17A7-483E-833C-6C7D8FDF7FCA>