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/mld6.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/mld6.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.39 retrieving revision 1.54.2.1 diff -u -p -r1.39 -r1.54.2.1 --- src/sys/netinet6/mld6.c 2007/07/09 21:11:13 1.39 +++ src/sys/netinet6/mld6.c 2012/04/17 00:08:45 1.54.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.39 2007/07/09 21:11:13 ad Exp $ */ +/* $NetBSD: mld6.c,v 1.54.2.1 2012/04/17 00:08:45 yamt Exp $ */ /* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */ /* @@ -102,7 +102,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.39 2007/07/09 21:11:13 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.54.2.1 2012/04/17 00:08:45 yamt Exp $"); #include "opt_inet.h" @@ -110,11 +110,13 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.3 #include #include #include +#include #include #include #include #include #include +#include #include @@ -125,6 +127,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.3 #include #include #include +#include #include #include @@ -163,11 +166,10 @@ static struct mld_hdr * mld_allocbuf(str static void mld_sendpkt(struct in6_multi *, int, const struct in6_addr *); static void mld_starttimer(struct in6_multi *); static void mld_stoptimer(struct in6_multi *); -static void mld_timeo(struct in6_multi *); static u_long mld_timerresid(struct in6_multi *); void -mld_init() +mld_init(void) { static u_int8_t hbh_buf[8]; struct ip6_hbh *hbh = (struct ip6_hbh *)hbh_buf; @@ -181,7 +183,7 @@ mld_init() hbh_buf[3] = 0; hbh_buf[4] = IP6OPT_RTALERT; hbh_buf[5] = IP6OPT_RTALERT_LEN - 2; - bcopy((void *)&rtalert_code, &hbh_buf[6], sizeof(u_int16_t)); + memcpy(&hbh_buf[6], (void *)&rtalert_code, sizeof(u_int16_t)); ip6_opts.ip6po_hbh = hbh; /* We will specify the hoplimit by a multicast option. */ @@ -203,8 +205,7 @@ mld_starttimer(struct in6_multi *in6m) } /* start or restart the timer */ - callout_reset(in6m->in6m_timer_ch, in6m->in6m_timer, - (void (*) __P((void *)))mld_timeo, in6m); + callout_schedule(&in6m->in6m_timer_ch, in6m->in6m_timer); } static void @@ -213,19 +214,20 @@ mld_stoptimer(struct in6_multi *in6m) if (in6m->in6m_timer == IN6M_TIMER_UNDEF) return; - callout_stop(in6m->in6m_timer_ch); + callout_stop(&in6m->in6m_timer_ch); in6m->in6m_timer = IN6M_TIMER_UNDEF; } static void -mld_timeo(struct in6_multi *in6m) +mld_timeo(void *arg) { - int s = splsoftnet(); + struct in6_multi *in6m = arg; - in6m->in6m_timer = IN6M_TIMER_UNDEF; + mutex_enter(softnet_lock); + KERNEL_LOCK(1, NULL); - callout_stop(in6m->in6m_timer_ch); + in6m->in6m_timer = IN6M_TIMER_UNDEF; switch (in6m->in6m_state) { case MLD_REPORTPENDING: @@ -236,7 +238,8 @@ mld_timeo(struct in6_multi *in6m) break; } - splx(s); + KERNEL_UNLOCK_ONE(NULL); + mutex_exit(softnet_lock); } static u_long @@ -260,7 +263,7 @@ mld_timerresid(struct in6_multi *in6m) } /* return the remaining time in milliseconds */ - return (((u_long)(diff.tv_sec * 1000000 + diff.tv_usec)) / 1000); + return diff.tv_sec * 1000 + diff.tv_usec / 1000; } static void @@ -287,7 +290,7 @@ mld_start_listening(struct in6_multi *in in6m->in6m_state = MLD_OTHERLISTENER; } else { mld_sendpkt(in6m, MLD_LISTENER_REPORT, NULL); - in6m->in6m_timer = arc4random() % + in6m->in6m_timer = cprng_fast32() % (MLD_UNSOLICITED_REPORT_INTERVAL * hz); in6m->in6m_state = MLD_IREPORTEDLAST; @@ -322,17 +325,17 @@ mld_stop_listening(struct in6_multi *in6 void mld_input(struct mbuf *m, int off) { - struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); + struct ip6_hdr *ip6; struct mld_hdr *mldh; struct ifnet *ifp = m->m_pkthdr.rcvif; struct in6_multi *in6m = NULL; struct in6_addr mld_addr, all_in6; struct in6_ifaddr *ia; - int timer = 0; /* timer value in the MLD query header */ + u_long timer = 0; /* timer value in the MLD query header */ IP6_EXTHDR_GET(mldh, struct mld_hdr *, m, off, sizeof(*mldh)); if (mldh == NULL) { - icmp6stat.icp6s_tooshort++; + ICMP6_STATINC(ICMP6_STAT_TOOSHORT); return; } @@ -439,9 +442,9 @@ mld_input(struct mbuf *m, int off) mld_sendpkt(in6m, MLD_LISTENER_REPORT, NULL); in6m->in6m_state = MLD_IREPORTEDLAST; } else if (in6m->in6m_timer == IN6M_TIMER_UNDEF || - mld_timerresid(in6m) > (u_long)timer) { - in6m->in6m_timer = arc4random() % - (int)(((long)timer * hz) / 1000); + mld_timerresid(in6m) > timer) { + in6m->in6m_timer = + 1 + (cprng_fast32() % timer) * hz / 1000; mld_starttimer(in6m); } } @@ -539,7 +542,7 @@ mld_sendpkt(struct in6_multi *in6m, int im6o.im6o_multicast_loop = (ip6_mrouter != NULL); /* increment output statictics */ - icmp6stat.icp6s_outhist[type]++; + ICMP6_STATINC(ICMP6_STAT_OUTHIST + type); icmp6_ifstat_inc(ifp, ifs6_out_msg); switch (type) { case MLD_LISTENER_QUERY: @@ -554,7 +557,7 @@ mld_sendpkt(struct in6_multi *in6m, int } ip6_output(mh, &ip6_opts, NULL, ia ? 0 : IPV6_UNSPECSRC, - &im6o, (struct socket *)NULL, NULL); + &im6o, NULL, NULL); } static struct mld_hdr * @@ -614,7 +617,7 @@ in6_addmulti(struct in6_addr *maddr6, st int *errorp, int timer) { struct in6_ifaddr *ia; - struct in6_ifreq ifr; + struct sockaddr_in6 sin6; struct in6_multi *in6m; int s = splsoftnet(); @@ -635,28 +638,19 @@ in6_addmulti(struct in6_addr *maddr6, st * and link it into the interface's multicast list. */ in6m = (struct in6_multi *) - malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT); + malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT|M_ZERO); if (in6m == NULL) { splx(s); *errorp = ENOBUFS; return (NULL); } - memset(in6m, 0, sizeof(*in6m)); in6m->in6m_addr = *maddr6; in6m->in6m_ifp = ifp; in6m->in6m_refcount = 1; in6m->in6m_timer = IN6M_TIMER_UNDEF; - in6m->in6m_timer_ch = - malloc(sizeof(*in6m->in6m_timer_ch), M_IPMADDR, M_NOWAIT); - if (in6m->in6m_timer_ch == NULL) { - free(in6m, M_IPMADDR); - splx(s); - return (NULL); - } IFP_TO_IA6(ifp, ia); if (ia == NULL) { - /* leaks in6m_timer_ch */ free(in6m, M_IPMADDR); splx(s); *errorp = EADDRNOTAVAIL; /* appropriate? */ @@ -670,25 +664,18 @@ in6_addmulti(struct in6_addr *maddr6, st * Ask the network driver to update its multicast reception * filter appropriately for the new address. */ - memset(&ifr.ifr_addr, 0, sizeof(struct sockaddr_in6)); - ifr.ifr_addr.sin6_family = AF_INET6; - ifr.ifr_addr.sin6_len = sizeof(struct sockaddr_in6); - ifr.ifr_addr.sin6_addr = *maddr6; - if (ifp->if_ioctl == NULL) - *errorp = ENXIO; /* XXX: appropriate? */ - else - *errorp = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, - (void *)&ifr); + sockaddr_in6_init(&sin6, maddr6, 0, 0, 0); + *errorp = if_mcast_op(ifp, SIOCADDMULTI, sin6tosa(&sin6)); if (*errorp) { LIST_REMOVE(in6m, in6m_entry); - /* leaks in6m_timer_ch */ free(in6m, M_IPMADDR); IFAFREE(&ia->ia_ifa); splx(s); return (NULL); } - callout_init(in6m->in6m_timer_ch, 0); + callout_init(&in6m->in6m_timer_ch, CALLOUT_MPSAFE); + callout_setfunc(&in6m->in6m_timer_ch, mld_timeo, in6m); in6m->in6m_timer = timer; if (in6m->in6m_timer > 0) { in6m->in6m_state = MLD_REPORTPENDING; @@ -714,7 +701,7 @@ in6_addmulti(struct in6_addr *maddr6, st void in6_delmulti(struct in6_multi *in6m) { - struct in6_ifreq ifr; + struct sockaddr_in6 sin6; struct in6_ifaddr *ia; int s = splsoftnet(); @@ -752,13 +739,9 @@ in6_delmulti(struct in6_multi *in6m) * Notify the network driver to update its multicast * reception filter. */ - memset(&ifr.ifr_addr, 0, sizeof(struct sockaddr_in6)); - ifr.ifr_addr.sin6_family = AF_INET6; - ifr.ifr_addr.sin6_len = sizeof(struct sockaddr_in6); - ifr.ifr_addr.sin6_addr = in6m->in6m_addr; - (*in6m->in6m_ifp->if_ioctl)(in6m->in6m_ifp, - SIOCDELMULTI, (void *)&ifr); - free(in6m->in6m_timer_ch, M_IPMADDR); + sockaddr_in6_init(&sin6, &in6m->in6m_addr, 0, 0, 0); + if_mcast_op(in6m->in6m_ifp, SIOCDELMULTI, sin6tosa(&sin6)); + callout_destroy(&in6m->in6m_timer_ch); free(in6m, M_IPMADDR); } splx(s); @@ -771,13 +754,12 @@ in6_joingroup(struct ifnet *ifp, struct { struct in6_multi_mship *imm; - imm = malloc(sizeof(*imm), M_IPMADDR, M_NOWAIT); - if (!imm) { + imm = malloc(sizeof(*imm), M_IPMADDR, M_NOWAIT|M_ZERO); + if (imm == NULL) { *errorp = ENOBUFS; return NULL; } - memset(imm, 0, sizeof(*imm)); imm->i6mm_maddr = in6_addmulti(addr, ifp, errorp, timer); if (!imm->i6mm_maddr) { /* *errorp is already set */ @@ -887,9 +869,8 @@ in6_createmkludge(struct ifnet *ifp) return; } - mk = malloc(sizeof(*mk), M_IPMADDR, M_WAITOK); + mk = malloc(sizeof(*mk), M_IPMADDR, M_ZERO|M_WAITOK); - memset(mk, 0, sizeof(*mk)); LIST_INIT(&mk->mk_head); mk->mk_ifp = ifp; LIST_INSERT_HEAD(&in6_mk, mk, mk_entry);