From owner-svn-src-head@FreeBSD.ORG Fri Feb 27 14:00:20 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BB4B106566C; Fri, 27 Feb 2009 14:00:20 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id D72FA8FC20; Fri, 27 Feb 2009 14:00:19 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 8456941C596; Fri, 27 Feb 2009 15:00:16 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id a7kUwPOKGm+V; Fri, 27 Feb 2009 15:00:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 1F19241C679; Fri, 27 Feb 2009 15:00:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id BA7C24448E6; Fri, 27 Feb 2009 13:59:55 +0000 (UTC) Date: Fri, 27 Feb 2009 13:59:55 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org In-Reply-To: <200902271329.n1RDTIqk071621@svn.freebsd.org> Message-ID: <20090227133048.A53478@maildrop.int.zabbadoz.net> References: <200902271329.n1RDTIqk071621@svn.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Subject: Re: svn commit: r189105 - head/sys/contrib/ipfilter/netinet X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Feb 2009 14:00:21 -0000 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 > #include > #include > +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800056) > +# include > +#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 > -#endif > #if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) > # include > #endif > -- Bjoern A. Zeeb The greatest risk is not taking one.