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.47.2.1 retrieving revision 1.59.2.1 diff -u -p -r1.47.2.1 -r1.59.2.1 --- src/sys/netinet6/mld6.c 2009/01/19 13:20:14 1.47.2.1 +++ src/sys/netinet6/mld6.c 2014/12/29 17:33:49 1.59.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.47.2.1 2009/01/19 13:20:14 skrll Exp $ */ +/* $NetBSD: mld6.c,v 1.59.2.1 2014/12/29 17:33:49 martin 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.47.2.1 2009/01/19 13:20:14 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.59.2.1 2014/12/29 17:33:49 martin Exp $"); #include "opt_inet.h" @@ -116,6 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.4 #include #include #include +#include #include @@ -136,7 +137,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.4 * This structure is used to keep track of in6_multi chains which belong to * deleted interface addresses. */ -static LIST_HEAD(, multi6_kludge) in6_mk; /* XXX BSS initialization */ +static LIST_HEAD(, multi6_kludge) in6_mk = LIST_HEAD_INITIALIZER(in6_mk); struct multi6_kludge { LIST_ENTRY(multi6_kludge) mk_entry; @@ -182,7 +183,7 @@ mld_init(void) 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. */ @@ -194,6 +195,8 @@ mld_starttimer(struct in6_multi *in6m) { struct timeval now; + KASSERT(in6m->in6m_timer != IN6M_TIMER_UNDEF); + microtime(&now); in6m->in6m_timer_expire.tv_sec = now.tv_sec + in6m->in6m_timer / hz; in6m->in6m_timer_expire.tv_usec = now.tv_usec + @@ -226,6 +229,9 @@ mld_timeo(void *arg) mutex_enter(softnet_lock); KERNEL_LOCK(1, NULL); + if (in6m->in6m_timer == IN6M_TIMER_UNDEF) + goto out; + in6m->in6m_timer = IN6M_TIMER_UNDEF; switch (in6m->in6m_state) { @@ -237,6 +243,7 @@ mld_timeo(void *arg) break; } +out: KERNEL_UNLOCK_ONE(NULL); mutex_exit(softnet_lock); } @@ -289,7 +296,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; @@ -324,7 +331,7 @@ 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; @@ -443,7 +450,7 @@ mld_input(struct mbuf *m, int off) } else if (in6m->in6m_timer == IN6M_TIMER_UNDEF || mld_timerresid(in6m) > timer) { in6m->in6m_timer = - 1 + (arc4random() % timer) * hz / 1000; + 1 + (cprng_fast32() % timer) * hz / 1000; mld_starttimer(in6m); } } @@ -556,7 +563,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 * @@ -616,7 +623,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(); @@ -637,14 +644,13 @@ 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; @@ -664,8 +670,8 @@ in6_addmulti(struct in6_addr *maddr6, st * Ask the network driver to update its multicast reception * filter appropriately for the new address. */ - sockaddr_in6_init(&ifr.ifr_addr, maddr6, 0, 0, 0); - *errorp = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, &ifr); + sockaddr_in6_init(&sin6, maddr6, 0, 0, 0); + *errorp = if_mcast_op(ifp, SIOCADDMULTI, sin6tosa(&sin6)); if (*errorp) { LIST_REMOVE(in6m, in6m_entry); free(in6m, M_IPMADDR); @@ -701,7 +707,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(); @@ -739,9 +745,14 @@ in6_delmulti(struct in6_multi *in6m) * Notify the network driver to update its multicast * reception filter. */ - sockaddr_in6_init(&ifr.ifr_addr, &in6m->in6m_addr, 0, 0, 0); - (*in6m->in6m_ifp->if_ioctl)(in6m->in6m_ifp, SIOCDELMULTI, &ifr); + sockaddr_in6_init(&sin6, &in6m->in6m_addr, 0, 0, 0); + if_mcast_op(in6m->in6m_ifp, SIOCDELMULTI, sin6tosa(&sin6)); + + /* Tell mld_timeo we're halting the timer */ + in6m->in6m_timer = IN6M_TIMER_UNDEF; + callout_halt(&in6m->in6m_timer_ch, softnet_lock); callout_destroy(&in6m->in6m_timer_ch); + free(in6m, M_IPMADDR); } splx(s); @@ -754,13 +765,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 */ @@ -870,9 +880,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); @@ -899,3 +908,152 @@ in6_purgemkludge(struct ifnet *ifp) LIST_REMOVE(mk, mk_entry); free(mk, M_IPMADDR); } + +static int +in6_mkludge_sysctl(SYSCTLFN_ARGS) +{ + struct multi6_kludge *mk; + struct in6_multi *in6m; + int error; + uint32_t tmp; + size_t written; + + if (namelen != 1) + return EINVAL; + + if (oldp == NULL) { + *oldlenp = 0; + LIST_FOREACH(mk, &in6_mk, mk_entry) { + if (mk->mk_ifp->if_index == name[0]) + continue; + LIST_FOREACH(in6m, &mk->mk_head, in6m_entry) { + *oldlenp += sizeof(struct in6_addr) + + sizeof(uint32_t); + } + } + return 0; + } + + error = 0; + written = 0; + LIST_FOREACH(mk, &in6_mk, mk_entry) { + if (mk->mk_ifp->if_index == name[0]) + continue; + LIST_FOREACH(in6m, &mk->mk_head, in6m_entry) { + if (written + sizeof(struct in6_addr) + + sizeof(uint32_t) > *oldlenp) + goto done; + error = sysctl_copyout(l, &in6m->in6m_addr, + oldp, sizeof(struct in6_addr)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(struct in6_addr); + written += sizeof(struct in6_addr); + tmp = in6m->in6m_refcount; + error = sysctl_copyout(l, &tmp, oldp, sizeof(tmp)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(tmp); + written += sizeof(tmp); + } + } + +done: + *oldlenp = written; + return error; +} + +static int +in6_multicast_sysctl(SYSCTLFN_ARGS) +{ + struct ifnet *ifp; + struct ifaddr *ifa; + struct in6_ifaddr *ifa6; + struct in6_multi *in6m; + uint32_t tmp; + int error; + size_t written; + + if (namelen != 1) + return EINVAL; + + ifp = if_byindex(name[0]); + if (ifp == NULL) + return ENODEV; + + if (oldp == NULL) { + *oldlenp = 0; + IFADDR_FOREACH(ifa, ifp) { + if (ifa->ifa_addr == NULL) + continue; + if (ifa->ifa_addr->sa_family != AF_INET6) + continue; + ifa6 = (struct in6_ifaddr *)ifa; + LIST_FOREACH(in6m, &ifa6->ia6_multiaddrs, in6m_entry) { + *oldlenp += 2 * sizeof(struct in6_addr) + + sizeof(uint32_t); + } + } + return 0; + } + + error = 0; + written = 0; + IFADDR_FOREACH(ifa, ifp) { + if (ifa->ifa_addr == NULL) + continue; + if (ifa->ifa_addr->sa_family != AF_INET6) + continue; + ifa6 = (struct in6_ifaddr *)ifa; + LIST_FOREACH(in6m, &ifa6->ia6_multiaddrs, in6m_entry) { + if (written + 2 * sizeof(struct in6_addr) + + sizeof(uint32_t) > *oldlenp) + goto done; + error = sysctl_copyout(l, &ifa6->ia_addr.sin6_addr, + oldp, sizeof(struct in6_addr)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(struct in6_addr); + written += sizeof(struct in6_addr); + error = sysctl_copyout(l, &in6m->in6m_addr, + oldp, sizeof(struct in6_addr)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(struct in6_addr); + written += sizeof(struct in6_addr); + tmp = in6m->in6m_refcount; + error = sysctl_copyout(l, &tmp, oldp, sizeof(tmp)); + if (error) + goto done; + oldp = (char *)oldp + sizeof(tmp); + written += sizeof(tmp); + } + } +done: + *oldlenp = written; + return error; +} + +SYSCTL_SETUP(sysctl_in6_mklude_setup, "sysctl net.inet6.multicast_kludge subtree setup") +{ + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "inet6", NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET6, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "multicast", + SYSCTL_DESCR("Multicast information"), + in6_multicast_sysctl, 0, NULL, 0, + CTL_NET, PF_INET6, CTL_CREATE, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "multicast_kludge", + SYSCTL_DESCR("multicast kludge information"), + in6_mkludge_sysctl, 0, NULL, 0, + CTL_NET, PF_INET6, CTL_CREATE, CTL_EOL); +}