[src/trunk]: src/sys/netinet6 checked build on alpha and i386, with GENERIC.v6.

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c8bb2ae72be1
branches:  trunk
changeset: 474426:c8bb2ae72be1
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Jul 06 08:55:56 1999 +0000

description:
checked build on alpha and i386, with GENERIC.v6.
fixed several sizeof(void *) and sizeof(size_t) issues on alpha.

Thanks to: Dave Huang and Tim Rightnour

diffstat:

 sys/netinet6/ah_input.c   |  10 +++++-----
 sys/netinet6/icmp6.c      |   8 +++++---
 sys/netinet6/in6_cksum.c  |   6 +++---
 sys/netinet6/ip6_mroute.c |   6 +++---
 sys/netinet6/raw_ip6.c    |   4 ++--
 5 files changed, 18 insertions(+), 16 deletions(-)

diffs (126 lines):

diff -r 8ad992349bce -r c8bb2ae72be1 sys/netinet6/ah_input.c
--- a/sys/netinet6/ah_input.c   Tue Jul 06 08:04:31 1999 +0000
+++ b/sys/netinet6/ah_input.c   Tue Jul 06 08:55:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ah_input.c,v 1.3 1999/07/03 21:30:17 thorpej Exp $     */
+/*     $NetBSD: ah_input.c,v 1.4 1999/07/06 08:55:56 itojun Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -182,8 +182,8 @@
 
        if ((ah->ah_len << 2) - sizoff != siz1) {
                log(LOG_NOTICE, "sum length mismatch in IPv4 AH input "
-                       "(%d should be %d): %s\n",
-                       (ah->ah_len << 2) - sizoff, siz1,
+                       "(%d should be %u): %s\n",
+                       (ah->ah_len << 2) - sizoff, (unsigned int)siz1,
                        ipsec4_logpacketstr(ip, spi));
                ipsecstat.in_inval++;
                goto fail;
@@ -570,8 +570,8 @@
 
        if ((ah->ah_len << 2) - sizoff != siz1) {
                log(LOG_NOTICE, "sum length mismatch in IPv6 AH input "
-                       "(%d should be %d): %s\n",
-                       (ah->ah_len << 2) - sizoff, siz1,
+                       "(%d should be %u): %s\n",
+                       (ah->ah_len << 2) - sizoff, (unsigned int)siz1,
                        ipsec6_logpacketstr(ip6, spi));
                ipsec6stat.in_inval++;
                goto fail;
diff -r 8ad992349bce -r c8bb2ae72be1 sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c      Tue Jul 06 08:04:31 1999 +0000
+++ b/sys/netinet6/icmp6.c      Tue Jul 06 08:55:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icmp6.c,v 1.3 1999/07/03 21:30:18 thorpej Exp $        */
+/*     $NetBSD: icmp6.c,v 1.4 1999/07/06 08:55:56 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -1156,13 +1156,15 @@
                /* sanity checks */
                if (off < sizeof(struct ip6_hdr)) {
                        printf("sanity fail: off=%x, sizeof(ip6)=%x in %s:%d\n",
-                              off, sizeof(struct ip6_hdr), __FILE__, __LINE__);
+                              (unsigned int)off,
+                              (unsigned int)sizeof(struct ip6_hdr),
+                              __FILE__, __LINE__);
                        goto bad;
                }
                siz = off - sizeof(struct ip6_hdr);
                if (plen < siz) {
                        printf("sanity fail: siz=%x, payloadlen=%x in %s:%d\n",
-                              siz, plen, __FILE__, __LINE__);
+                              (unsigned int)siz, plen, __FILE__, __LINE__);
                        goto bad;
                }
                IP6_EXTHDR_CHECK(m, 0, off, /*nothing*/);
diff -r 8ad992349bce -r c8bb2ae72be1 sys/netinet6/in6_cksum.c
--- a/sys/netinet6/in6_cksum.c  Tue Jul 06 08:04:31 1999 +0000
+++ b/sys/netinet6/in6_cksum.c  Tue Jul 06 08:55:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_cksum.c,v 1.3 1999/07/03 21:30:18 thorpej Exp $    */
+/*     $NetBSD: in6_cksum.c,v 1.4 1999/07/06 08:55:56 itojun Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -184,7 +184,7 @@
        /*
         * Force to even boundary.
         */
-       if ((1 & (int) w) && (mlen > 0)) {
+       if ((1 & (long) w) && (mlen > 0)) {
                REDUCE;
                sum <<= 8;
                s_util.c[0] = *(u_char *)w;
@@ -260,7 +260,7 @@
                /*
                 * Force to even boundary.
                 */
-               if ((1 & (int) w) && (mlen > 0)) {
+               if ((1 & (long) w) && (mlen > 0)) {
                        REDUCE;
                        sum <<= 8;
                        s_util.c[0] = *(u_char *)w;
diff -r 8ad992349bce -r c8bb2ae72be1 sys/netinet6/ip6_mroute.c
--- a/sys/netinet6/ip6_mroute.c Tue Jul 06 08:04:31 1999 +0000
+++ b/sys/netinet6/ip6_mroute.c Tue Jul 06 08:55:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_mroute.c,v 1.4 1999/07/04 02:01:15 itojun Exp $    */
+/*     $NetBSD: ip6_mroute.c,v 1.5 1999/07/06 08:55:56 itojun Exp $    */
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -693,11 +693,11 @@
 
                        if (nstl++)
                                log(LOG_ERR,
-                                   "add_m6fc: %s o %s g %s p %x dbx %x\n",
+                                   "add_m6fc: %s o %s g %s p %x dbx %p\n",
                                    "multiple kernel entries",
                                    ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
                                    ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
-                                   mfccp->mf6cc_parent, (u_int)rt->mf6c_stall);
+                                   mfccp->mf6cc_parent, rt->mf6c_stall);
 
 #ifdef MRT6DEBUG
                        if (mrt6debug & DEBUG_MFC)
diff -r 8ad992349bce -r c8bb2ae72be1 sys/netinet6/raw_ip6.c
--- a/sys/netinet6/raw_ip6.c    Tue Jul 06 08:04:31 1999 +0000
+++ b/sys/netinet6/raw_ip6.c    Tue Jul 06 08:55:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip6.c,v 1.4 1999/07/04 02:01:15 itojun Exp $       */
+/*     $NetBSD: raw_ip6.c,v 1.5 1999/07/06 08:55:56 itojun Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -471,7 +471,7 @@
                }
                splx(s);
                in6p = sotoin6pcb(so);
-               in6p->in6p_ip6.ip6_nxt = (int)nam;
+               in6p->in6p_ip6.ip6_nxt = (long)nam;
                in6p->in6p_cksum = -1;
 #ifdef IPSEC
                if ((error = ipsec_init_policy(&in6p->in6p_sp)) != 0)