From owner-svn-src-head@FreeBSD.ORG Mon May 19 18:36:03 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CB6C206; Mon, 19 May 2014 18:36:03 +0000 (UTC) Received: from mail.lifanov.com (mail.lifanov.com [206.125.175.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E851128B6; Mon, 19 May 2014 18:36:02 +0000 (UTC) Received: by mail.lifanov.com (Postfix, from userid 58) id 514DF1B0835; Mon, 19 May 2014 14:29:04 -0400 (EDT) Received: from [10.1.3.5] (cnet520-windstream.mcclatchyinteractive.com [166.108.16.2]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.lifanov.com (Postfix) with ESMTPSA id 709351B0830; Mon, 19 May 2014 14:29:02 -0400 (EDT) Message-ID: <537A4D6D.7070608@mail.lifanov.com> Date: Mon, 19 May 2014 14:29:01 -0400 From: Nikolai Lifanov User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: "Alexander V. Chernikov" , src-committers@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r266310 - in head: sbin/ipfw sys/netinet sys/netpfil/ipfw References: <201405171345.s4HDj3LK020332@svn.freebsd.org> In-Reply-To: <201405171345.s4HDj3LK020332@svn.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 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: Mon, 19 May 2014 18:36:03 -0000 On 05/17/14 09:45, Alexander V. Chernikov wrote: > Author: melifaro > Date: Sat May 17 13:45:03 2014 > New Revision: 266310 > URL: http://svnweb.freebsd.org/changeset/base/266310 > > Log: > Fix wrong formatting of 0.0.0.0/X table records in ipfw(8). > > Add `flags` u16 field to the hole in ipfw_table_xentry structure. > Kernel has been guessing address family for supplied record based > on xent length size. > Userland, however, has been getting fixed-size ipfw_table_xentry structures > guessing address family by checking address by IN6_IS_ADDR_V4COMPAT(). > > Fix this behavior by providing specific IPFW_TCF_INET flag for IPv4 records. > > PR: bin/189471 > Submitted by: Dennis Yusupoff > MFC after: 2 weeks > > Modified: > head/sbin/ipfw/ipfw2.c > head/sys/netinet/ip_fw.h > head/sys/netpfil/ipfw/ip_fw_table.c > This seems to break things for me: ===> sbin/ipfw (all) cc -O2 -pipe -march=corei7-avx -DPF -g -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Qunused-arguments -c /usr/src/sbin/ipfw/ipfw2.c /usr/src/sbin/ipfw/ipfw2.c:4392:15: error: no member named 'flags' in 'struct _ipfw_table_xentry' if ((xent->flags & IPFW_TCF_INET) != 0) { ~~~~ ^ /usr/src/sbin/ipfw/ipfw2.c:4392:23: error: use of undeclared identifier 'IPFW_TCF_INET' if ((xent->flags & IPFW_TCF_INET) != 0) { ^ 2 errors generated. *** Error code 1 Stop. I'm building from 266216, and I tried several revisions in between this one and r266447. - Nikolai Lifanov