Re: CVS commit: [netbsd-7] src/sys/net/npf

[Takahiro Kambe <taca%back-street.net@localhost>]

In message <c39462a3-ab62-f31d-7b60-27c48df2d57f%spg.tu-darmstadt.de@localhost>
	on Wed, 17 May 2017 13:22:39 +0200,
	Hauke Fath <hf%spg.tu-darmstadt.de@localhost> wrote:
> [properly re-sent to source-changes-d -- it was cribbed from the web
> list archive]
> 
> 
> The pull-up
> 
>> Pull up following revision(s) (requested by jnemeth in ticket #1394):
>>         sys/net/npf/npf_inet.c: revisions 1.34, 1.35 via patch
>>         sys/net/npf/npf_mbuf.c: revision 1.16
>>         sys/net/npf/npf_nat.c: revision 1.40
>> minimal changes necessary to link into an INET6-less kernel.
>> --
>> fixup misplaced #endif
> 
> leads to
> 
> [...]
> --- npf_nat.o ---
> /u/netbsd-builds/7/amd64/tools/bin/x86_64--netbsd-gcc -mcmodel=kernel
> -mno-red-zone -mno-mmx -mno-sse -mno-avx -msoft-float -ffreestanding
> -fno-zero-initialized-in-bss -O2 -fno-omit-frame-pointer
> -fstack-protector -Wstack-protector --param ssp-buffer-size=1
> -fno-strict-aliasing -fno-common -std=gnu99 -Werror -Wall -Wno-main
> -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes
> -Wstrict-prototypes -Wold-style-definition -Wswitch -Wshadow
> -Wcast-qual -Wwrite-strings -Wno-unreachable-code -Wno-pointer-sign
> -Wno-attributes -Wextra -Wno-unused-parameter -Wold-style-definition
> -Wno-sign-compare --sysroot=/u/netbsd-builds/7/amd64/destdir -Damd64
> -Dx86_64 -I. -I/public/netbsd-7/sys/../common/include
> -I/public/netbsd-7/sys/arch -I/public/netbsd-7/sys -nostdinc
> -DCHILD_MAX=1024 -DOPEN_MAX=1024 -DIPSEC_ESP -DIPSEC_NAT_T
> -DMAXUSERS=64 -D_KERNEL -D_KERNEL_OPT -std=gnu99
> -I/public/netbsd-7/sys/lib/libkern/../../../common/lib/libc/quad
> -I/public/netbsd-7/sys/lib/libkern/../../../common/lib/libc/string
> -I/public/netbsd-7/sys/lib/libkern/../../../common/lib/libc/arch/x86_64/string
> -D_FORTIFY_SOURCE=2 -I/public/netbsd-7/sys/../common/include
> -I/public/netbsd-7/sys/external/bsd/acpica/dist/include -c
> /public/netbsd-7/sys/net/npf/npf_nat.c
> --- npf_inet.o ---
> /public/netbsd-7/sys/net/npf/npf_inet.c: In function 'npf_addr_dump':
> /public/netbsd-7/sys/net/npf/npf_inet.c:759:2: error: implicit
> declaration of function 'ip6_sprintf'
> [-Werror=implicit-function-declaration]
>   return ip6_sprintf(addr);
>   ^
> /public/netbsd-7/sys/net/npf/npf_inet.c:759:2: error: return makes
> pointer from integer without a cast [-Werror]
> cc1: all warnings being treated as errors
> *** [npf_inet.o] Error code 1
By comparing code with current, one line seems to missing.

Index: sys/net/npf/npf_inet.c
===================================================================
RCS file: /cvsroot/src/sys/net/npf/npf_inet.c,v
retrieving revision 1.32.2.1
diff -u -r1.32.2.1 npf_inet.c
--- sys/net/npf/npf_inet.c	12 May 2017 05:32:12 -0000	1.32.2.1
+++ sys/net/npf/npf_inet.c	20 May 2017 23:06:17 -0000
@@ -51,6 +51,7 @@
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
+#include <netinet6/in6_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet/tcp.h>

-- 
Takahiro Kambe <taca%back-street.net@localhost>