On 19.05.2014 22:29, Nikolai Lifanov wrote:
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 <d...@smartspb.net>
   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) {
It looks like your build is using old ip_fw.h version. Are you doing clean buildworld?
                                            ^
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




_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to