diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet6/frag6.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 12 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_output.c | 10 | ||||
| -rw-r--r-- | sys/netinet6/ip6_var.h | 4 | ||||
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 6 |
6 files changed, 20 insertions, 20 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index b97d75270cb..838f023cad2 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frag6.c,v 1.18 2002/09/11 03:15:36 itojun Exp $ */ +/* $OpenBSD: frag6.c,v 1.19 2002/09/11 03:27:30 itojun Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -586,7 +586,7 @@ insert: * Store NXT to the original. */ { - char *prvnxtp = ip6_get_prevhdr(m, offset); /* XXX */ + u_int8_t *prvnxtp = ip6_get_prevhdr(m, offset); /* XXX */ *prvnxtp = nxt; } diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 5319ebcdbb5..a2a5d45e1c6 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_ifattach.c,v 1.30 2002/09/11 03:15:36 itojun Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.31 2002/09/11 03:27:30 itojun Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -126,7 +126,7 @@ get_hw_ifid(ifp, in6) { struct ifaddr *ifa; struct sockaddr_dl *sdl; - u_int8_t *addr; + char *addr; size_t addrlen; static u_int8_t allzero[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; static u_int8_t allone[8] = @@ -518,11 +518,11 @@ in6_nigroup(ifp, name, namelen, sa6) struct sockaddr_in6 *sa6; { const char *p; - u_char *q; + u_int8_t *q; MD5_CTX ctxt; u_int8_t digest[16]; - char l; - char n[64]; /* a single label must not exceed 63 chars */ + u_int8_t l; + u_int8_t n[64]; /* a single label must not exceed 63 chars */ if (!namelen || !name) return -1; @@ -533,7 +533,7 @@ in6_nigroup(ifp, name, namelen, sa6) if (p - name > sizeof(n) - 1) return -1; /* label too long */ l = p - name; - strncpy(n, name, l); + strncpy((char *)n, name, l); n[(int)l] = '\0'; for (q = n; *q; q++) { if ('A' <= *q && *q <= 'Z') diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index a26b52e9c22..1dee83c9bcd 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.45 2002/09/11 03:15:36 itojun Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.46 2002/09/11 03:27:30 itojun Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -1241,7 +1241,7 @@ ip6_pullexthdr(m, off, nxt) * carefully. Moreover, it will not be used in the near future when * we develop `neater' mechanism to process extension headers. */ -char * +u_int8_t * ip6_get_prevhdr(m, off) struct mbuf *m; int off; diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 17b82f001fb..ee19630785f 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.70 2002/09/11 03:15:36 itojun Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.71 2002/09/11 03:27:30 itojun Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -986,7 +986,7 @@ ip6_insert_jumboopt(exthdrs, plen) u_int32_t plen; { struct mbuf *mopt; - u_char *optbuf; + u_int8_t *optbuf; u_int32_t v; #define JUMBOOPTLEN 8 /* length of jumbo payload option and padding */ @@ -1002,7 +1002,7 @@ ip6_insert_jumboopt(exthdrs, plen) if (mopt == 0) return (ENOBUFS); mopt->m_len = JUMBOOPTLEN; - optbuf = mtod(mopt, u_char *); + optbuf = mtod(mopt, u_int8_t *); optbuf[1] = 0; /* = ((JUMBOOPTLEN) >> 3) - 1 */ exthdrs->ip6e_hbh = mopt; } else { @@ -1043,11 +1043,11 @@ ip6_insert_jumboopt(exthdrs, plen) n->m_len = oldoptlen + JUMBOOPTLEN; bcopy(mtod(mopt, caddr_t), mtod(n, caddr_t), oldoptlen); - optbuf = mtod(n, caddr_t) + oldoptlen; + optbuf = mtod(n, u_int8_t *) + oldoptlen; m_freem(mopt); mopt = exthdrs->ip6e_hbh = n; } else { - optbuf = mtod(mopt, u_char *) + mopt->m_len; + optbuf = mtod(mopt, u_int8_t *) + mopt->m_len; mopt->m_len += JUMBOOPTLEN; } optbuf[0] = IP6OPT_PADN; diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index ab4738b5e83..915979b2094 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_var.h,v 1.19 2002/06/08 21:22:03 itojun Exp $ */ +/* $OpenBSD: ip6_var.h,v 1.20 2002/09/11 03:27:30 itojun Exp $ */ /* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */ /* @@ -244,7 +244,7 @@ void ip6intr(void); void ip6_input(struct mbuf *); void ip6_freemoptions(struct ip6_moptions *); int ip6_unknown_opt(u_int8_t *, struct mbuf *, int); -char * ip6_get_prevhdr(struct mbuf *, int); +u_int8_t *ip6_get_prevhdr(struct mbuf *, int); int ip6_nexthdr(struct mbuf *, int, int, int *); int ip6_lasthdr(struct mbuf *, int, int, int *); int ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 51f2b3812c1..160b7707909 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.16 2002/09/11 03:15:36 itojun Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.17 2002/09/11 03:27:30 itojun Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -247,11 +247,11 @@ rip6_input(mp, offp, proto) if (proto == IPPROTO_NONE) m_freem(m); else { - char *prvnxtp = ip6_get_prevhdr(m, *offp); /* XXX */ + u_int8_t *prvnxtp = ip6_get_prevhdr(m, *offp); /* XXX */ in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_protounknown); icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_NEXTHEADER, - prvnxtp - mtod(m, char *)); + prvnxtp - mtod(m, u_int8_t *)); } ip6stat.ip6s_delivered--; } |