cvs commit: src/sys/netinet in_pcb.c in_pcb.h tcp_usrreq.c

[Florian C. Smeets]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Watson wrote:
> rwatson     2007-02-17 21:02:39 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:
>     sys/netinet          in_pcb.c in_pcb.h tcp_usrreq.c 
>   Log:
>   Add "show inpcb", "show tcpcb" DDB commands, which should come in handy
>   for debugging sblock and other network panics.
>   
>   Revision  Changes    Path
>   1.186     +251 -1    src/sys/netinet/in_pcb.c
>   1.92      +6 -0      src/sys/netinet/in_pcb.h
>   1.146     +321 -1    src/sys/netinet/tcp_usrreq.c

This breaks the kernel build for kernels without INET6.

I think something like this is needed:

- --- in_pcb.c.org        Sat Feb 17 23:57:26 2007
+++ in_pcb.c    Sat Feb 17 23:57:34 2007
@@ -1263,8 +1263,10 @@

        if (inc->inc_flags == 1) {
+#ifdef INET6
                /* IPv6. */
                ip6_sprintf(laddr_str, &inc->inc6_laddr);
                ip6_sprintf(faddr_str, &inc->inc6_faddr);
+#endif
        } else {
                /* IPv4. */
                inet_ntoa_r(inc->inc_laddr, laddr_str);

With this change i was able to build a kernel again.

Cheers
Florian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (Darwin)

iD8DBQFF14q6A+1tjUZ1YScRAsaWAKCBMuTasbAhlb8l0axHdHMoq/itrACfZPqv
XEYHWbrm9kbYKMPK9xVVi+A=
=Q281
-----END PGP SIGNATURE-----