[ipfw patch - add ipv6 support for table mechanism] request for testing/commit

[Steve Bertrand]

Joost Bekkers wrote:
> On Fri, May 8, 2009 00:39, Steve Bertrand wrote:
>> Raffaele De Lorenzo wrote:
>>> Thank you Steve.
>>> I think that this is a header problem (O_IP6_SRC_LOOKUP ecc are defined
>>> inside the header).... are you posted the new "ip_fw.h" file in
>>> "/sys/netinet/" directory?
>> ...but the problem persists with "make".
>>
> 
> I'm guessing /usr/include/ip_fw.h hasn't been updated. It should be the
> same is /usr/src/sys/netinet/ip_fw.h

... ip_fw.h doesn't appear in my /usr/include:

fbsd1# cd /usr/include
fbsd1# ll | grep ip_fw
fbsd1#

...I'll copy it:

fbsd1# cp /usr/src/sys/netinet/ip_fw.h /usr/include
fbsd1# ll /usr/include | grep ip_fw.h
-rw-r--r--   1 root  wheel  20916 May  8 02:04 ip_fw.h

... try again:

fbsd1# cd /usr/src/sbin/ipfw
fbsd1# make clean
rm -f ipfw ipfw2.o dummynet.o ipv6.o main.o nat.o altq.o ipfw.8.gz
ipfw.8.cat.gz

fbsd1# make
Warning: Object directory not changed from original /usr/src/sbin/ipfw
cc -O2 -fno-strict-aliasing -pipe  -Wsystem-headers -Wall
-Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c ipfw2.c
ipfw2.c: In function 'print_ip6':
ipfw2.c:1215: error: 'O_IP6_SRC_LOOKUP' undeclared (first use in this
function)
ipfw2.c:1215: error: (Each undeclared identifier is reported only once
ipfw2.c:1215: error: for each function it appears in.)
ipfw2.c:1216: error: 'O_IP6_DST_LOOKUP' undeclared (first use in this
function)
ipfw2.c:1219: warning: format '%u' expects type 'unsigned int', but
argument 2 has type 'struct in6_addr'
ipfw2.c: In function 'show_prerequisites':
ipfw2.c:1453: warning: suggest explicit braces to avoid ambiguous 'else'
ipfw2.c: In function 'show_ipfw':
ipfw2.c:1742: error: 'O_IP6_SRC_LOOKUP' undeclared (first use in this
function)
ipfw2.c:1756: error: 'O_IP6_DST_LOOKUP' undeclared (first use in this
function)
ipfw2.c: In function 'fill_ip6':
ipfw2.c:3061: error: 'O_IP6_DST_LOOKUP' undeclared (first use in this
function)
ipfw2.c: In function 'add_srcip6':
ipfw2.c:3190: error: 'O_IP6_DST_LOOKUP' undeclared (first use in this
function)
ipfw2.c:3191: error: 'O_IP6_SRC_LOOKUP' undeclared (first use in this
function)
ipfw2.c: In function 'add_dstip6':
ipfw2.c:3211: error: 'O_IP6_DST_LOOKUP' undeclared (first use in this
function)
ipfw2.c: In function 'setup_redir_addr':
ipfw2.c:3607: warning: unused variable 'i'
ipfw2.c: In function 'setup_redir_proto':
ipfw2.c:3826: warning: unused variable 'i'
ipfw2.c: In function 'config_nat':
ipfw2.c:4013: warning: unused variable 'ip'
ipfw2.c: In function 'table_handler':
ipfw2.c:5928: error: 'ipfw_table_entry' has no member named 'proto'
ipfw2.c:5928: error: 'IPFW_IPV4' undeclared (first use in this function)
ipfw2.c:5938: error: 'ipfw_table_entry' has no member named 'addr6'
ipfw2.c:5943: error: 'ipfw_table_entry' has no member named 'proto'
ipfw2.c:5943: error: 'IPFW_IPV6' undeclared (first use in this function)
ipfw2.c:5944: error: 'ipfw_table_entry' has no member named 'mask6'
ipfw2.c:6005: error: 'struct _ipfw_table_entry' has no member named 'proto'
ipfw2.c:6024: error: 'struct _ipfw_table_entry' has no member named 'mask6'
ipfw2.c:6025: error: 'struct _ipfw_table_entry' has no member named 'addr6'
ipfw2.c:6030: error: 'struct _ipfw_table_entry' has no member named 'proto'
ipfw2.c: In function 'show_nat':
ipfw2.c:6046: warning: unused variable 'lav'
*** Error code 1

Stop in /usr/src/sbin/ipfw.

Steve

ps. I'll re-csup my sources and try again...