Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.123.2.1 retrieving revision 1.124 diff -u -p -r1.123.2.1 -r1.124 --- src/sys/netinet6/ip6_input.c 2009/05/13 17:22:29 1.123.2.1 +++ src/sys/netinet6/ip6_input.c 2009/03/18 16:00:23 1.124 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.123.2.1 2009/05/13 17:22:29 jym Exp $ */ +/* $NetBSD: ip6_input.c,v 1.124 2009/03/18 16:00:23 cegger Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.123.2.1 2009/05/13 17:22:29 jym Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.124 2009/03/18 16:00:23 cegger Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -960,7 +960,7 @@ ip6_process_hopopts(struct mbuf *m, u_in return (-1); } optlen = IP6OPT_RTALERT_LEN; - memcpy((void *)&rtalert_val, (void *)(opt + 2), 2); + bcopy((void *)(opt + 2), (void *)&rtalert_val, 2); *rtalertp = ntohs(rtalert_val); break; case IP6OPT_JUMBO: @@ -995,7 +995,7 @@ ip6_process_hopopts(struct mbuf *m, u_in * We may see jumbolen in unaligned location, so * we'd need to perform bcopy(). */ - memcpy(&jumboplen, opt + 2, sizeof(jumboplen)); + bcopy(opt + 2, &jumboplen, sizeof(jumboplen)); jumboplen = (u_int32_t)htonl(jumboplen); #if 1 @@ -1138,7 +1138,7 @@ ip6_savecontrol(struct in6pcb *in6p, str if ((in6p->in6p_flags & IN6P_PKTINFO) != 0) { struct in6_pktinfo pi6; - memcpy(&pi6.ipi6_addr, &ip6->ip6_dst, sizeof(struct in6_addr)); + bcopy(&ip6->ip6_dst, &pi6.ipi6_addr, sizeof(struct in6_addr)); in6_clearscope(&pi6.ipi6_addr); /* XXX */ pi6.ipi6_ifindex = m->m_pkthdr.rcvif ? m->m_pkthdr.rcvif->if_index : 0; @@ -1273,7 +1273,7 @@ ip6_savecontrol(struct in6pcb *in6p, str switch (nxt) { case IPPROTO_DSTOPTS: - if (!(in6p->in6p_flags & IN6P_DSTOPTS)) + if (!in6p->in6p_flags & IN6P_DSTOPTS) break; *mp = sbcreatecontrol((void *)ip6e, elen, @@ -1284,7 +1284,7 @@ ip6_savecontrol(struct in6pcb *in6p, str break; case IPPROTO_ROUTING: - if (!(in6p->in6p_flags & IN6P_RTHDR)) + if (!in6p->in6p_flags & IN6P_RTHDR) break; *mp = sbcreatecontrol((void *)ip6e, elen,