Date: Fri, 27 Feb 2009 13:59:55 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r189105 - head/sys/contrib/ipfilter/netinet Message-ID: <20090227133048.A53478@maildrop.int.zabbadoz.net> In-Reply-To: <200902271329.n1RDTIqk071621@svn.freebsd.org> References: <200902271329.n1RDTIqk071621@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 27 Feb 2009, Bjoern A. Zeeb wrote: > Author: bz > Date: Fri Feb 27 13:29:18 2009 > New Revision: 189105 > URL: http://svn.freebsd.org/changeset/base/189105 > > Log: > Move the include of vinet.h further up before the ipfilter includes. Note: there seems to be something more serious going on here. At the old location the sizeof(struct vnet_inet) was 3808, while on the same machine/arch sizeof(struct vnet_inet) is 4160 at the new localtion at that's the correct size. The only reason I could think of is that ipfilter is aliasing one of our network stack structures (which admittedly is kind of hard) or something similar. I could not spot it at first glance but we'll have to investiate. > Modified: > head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c > > Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c > ============================================================================== > --- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Fri Feb 27 13:28:54 2009 (r189104) > +++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Fri Feb 27 13:29:18 2009 (r189105) > @@ -92,6 +92,9 @@ static const char rcsid[] = "@(#)$Id: ip > #include <netinet/udp.h> > #include <netinet/tcpip.h> > #include <netinet/ip_icmp.h> > +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800056) > +# include <netinet/vinet.h> > +#endif > #ifndef _KERNEL > # include "netinet/ipf.h" > #endif > @@ -112,9 +115,6 @@ static const char rcsid[] = "@(#)$Id: ip > #include "netinet/ip_scan.h" > #endif > #include "netinet/ip_pool.h" > -#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800056) > -# include <netinet/vinet.h> > -#endif > #if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) > # include <sys/malloc.h> > #endif > -- Bjoern A. Zeeb The greatest risk is not taking one.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090227133048.A53478>