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.51.4.1 retrieving revision 1.59.2.2 diff -u -p -r1.51.4.1 -r1.59.2.2 --- src/sys/netinet6/mld6.c 2011/05/31 03:05:09 1.51.4.1 +++ src/sys/netinet6/mld6.c 2015/01/23 09:27:15 1.59.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.51.4.1 2011/05/31 03:05:09 rmind Exp $ */ +/* $NetBSD: mld6.c,v 1.59.2.2 2015/01/23 09:27:15 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.51.4.1 2011/05/31 03:05:09 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.59.2.2 2015/01/23 09:27:15 martin Exp $"); #include "opt_inet.h" @@ -116,6 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.5 #include #include #include +#include #include @@ -136,7 +137,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.5 * 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; @@ -187,6 +188,7 @@ mld_init(void) ip6_opts.ip6po_hbh = hbh; /* We will specify the hoplimit by a multicast option. */ ip6_opts.ip6po_hlim = -1; + ip6_opts.ip6po_prefer_tempaddr = IP6PO_TEMPADDR_NOTPREFER; } static void @@ -194,6 +196,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 +230,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 +244,7 @@ mld_timeo(void *arg) break; } +out: KERNEL_UNLOCK_ONE(NULL); mutex_exit(softnet_lock); } @@ -289,7 +297,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; @@ -443,7 +451,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 +564,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 +624,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(); @@ -663,8 +671,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); @@ -700,7 +708,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(); @@ -738,9 +746,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); @@ -896,3 +909,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); +}