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.29.4.1 retrieving revision 1.78 diff -u -p -r1.29.4.1 -r1.78 --- src/sys/netinet6/mld6.c 2006/04/22 11:40:12 1.29.4.1 +++ src/sys/netinet6/mld6.c 2017/01/16 07:33:36 1.78 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.29.4.1 2006/04/22 11:40:12 simonb Exp $ */ +/* $NetBSD: mld6.c,v 1.78 2017/01/16 07:33:36 ryo Exp $ */ /* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */ /* @@ -102,19 +102,23 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.29.4.1 2006/04/22 11:40:12 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.78 2017/01/16 07:33:36 ryo Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#include "opt_net_mpsafe.h" +#endif #include #include #include #include -#include +#include #include #include #include #include +#include #include @@ -125,6 +129,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.2 #include #include #include +#include #include #include @@ -134,7 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.2 * 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; @@ -163,11 +168,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,19 +185,21 @@ mld_init() hbh_buf[3] = 0; hbh_buf[4] = IP6OPT_RTALERT; hbh_buf[5] = IP6OPT_RTALERT_LEN - 2; - bcopy((caddr_t)&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. */ ip6_opts.ip6po_hlim = -1; + ip6_opts.ip6po_prefer_tempaddr = IP6PO_TEMPADDR_NOTPREFER; } static void -mld_starttimer(in6m) - struct in6_multi *in6m; +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 + @@ -204,31 +210,32 @@ mld_starttimer(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 -mld_stoptimer(in6m) - struct in6_multi *in6m; +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(in6m) - 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); + if (in6m->in6m_timer == IN6M_TIMER_UNDEF) + goto out; + + in6m->in6m_timer = IN6M_TIMER_UNDEF; switch (in6m->in6m_state) { case MLD_REPORTPENDING: @@ -239,12 +246,13 @@ mld_timeo(in6m) break; } - splx(s); +out: + KERNEL_UNLOCK_ONE(NULL); + mutex_exit(softnet_lock); } static u_long -mld_timerresid(in6m) - struct in6_multi *in6m; +mld_timerresid(struct in6_multi *in6m) { struct timeval now, diff; @@ -264,12 +272,11 @@ mld_timerresid(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 -mld_start_listening(in6m) - struct in6_multi *in6m; +mld_start_listening(struct in6_multi *in6m) { struct in6_addr all_in6; @@ -292,7 +299,7 @@ mld_start_listening(in6m) 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; @@ -301,8 +308,7 @@ mld_start_listening(in6m) } static void -mld_stop_listening(in6m) - struct in6_multi *in6m; +mld_stop_listening(struct in6_multi *in6m) { struct in6_addr allnode, allrouter; @@ -326,22 +332,22 @@ mld_stop_listening(in6m) } void -mld_input(m, off) - struct mbuf *m; - int off; +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 ifnet *ifp; 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 */ + int s; + ifp = m_get_rcvif(m, &s); IP6_EXTHDR_GET(mldh, struct mld_hdr *, m, off, sizeof(*mldh)); if (mldh == NULL) { - icmp6stat.icp6s_tooshort++; - return; + ICMP6_STATINC(ICMP6_STAT_TOOSHORT); + goto out_nodrop; } /* source address validation */ @@ -367,12 +373,14 @@ mld_input(m, off) * though RFC3590 says "SHOULD log" if the source of a query * is the unspecified address. */ + char ip6bufs[INET6_ADDRSTRLEN]; + char ip6bufm[INET6_ADDRSTRLEN]; log(LOG_INFO, "mld_input: src %s is not link-local (grp=%s)\n", - ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&mldh->mld_addr)); + ip6_sprintf(ip6bufs,&ip6->ip6_src), + ip6_sprintf(ip6bufm, &mldh->mld_addr)); #endif - m_freem(m); - return; + goto out; } /* @@ -381,8 +389,7 @@ mld_input(m, off) mld_addr = mldh->mld_addr; if (in6_setscope(&mld_addr, ifp, NULL)) { /* XXX: this should not happen! */ - m_free(m); - return; + goto out; } /* @@ -398,7 +405,9 @@ mld_input(m, off) * if we sent the last report. */ switch (mldh->mld_type) { - case MLD_LISTENER_QUERY: + case MLD_LISTENER_QUERY: { + struct psref psref; + if (ifp->if_flags & IFF_LOOPBACK) break; @@ -424,14 +433,15 @@ mld_input(m, off) */ timer = ntohs(mldh->mld_maxdelay); - IFP_TO_IA6(ifp, ia); + ia = in6_get_ia_from_ifp_psref(ifp, &psref); if (ia == NULL) break; - for (in6m = ia->ia6_multiaddrs.lh_first; - in6m; - in6m = in6m->in6m_entry.le_next) - { + /* The following operations may sleep */ + m_put_rcvif(ifp, &s); + ifp = NULL; + + LIST_FOREACH(in6m, &ia->ia6_multiaddrs, in6m_entry) { if (IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, &all_in6) || IPV6_ADDR_MC_SCOPE(&in6m->in6m_addr) < IPV6_ADDR_SCOPE_LINKLOCAL) @@ -450,13 +460,15 @@ mld_input(m, 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); } } + ia6_release(ia, &psref); break; + } case MLD_LISTENER_REPORT: /* @@ -496,14 +508,15 @@ mld_input(m, off) break; } +out: m_freem(m); +out_nodrop: + m_put_rcvif(ifp, &s); } static void -mld_sendpkt(in6m, type, dst) - struct in6_multi *in6m; - int type; - const struct in6_addr *dst; +mld_sendpkt(struct in6_multi *in6m, int type, + const struct in6_addr *dst) { struct mbuf *mh; struct mld_hdr *mldh; @@ -512,6 +525,8 @@ mld_sendpkt(in6m, type, dst) struct in6_ifaddr *ia = NULL; struct ifnet *ifp = in6m->in6m_ifp; int ignflags; + struct psref psref; + int bound; /* * At first, find a link local address on the outgoing interface @@ -520,20 +535,31 @@ mld_sendpkt(in6m, type, dst) * the case where we first join a link-local address. */ ignflags = (IN6_IFF_NOTREADY|IN6_IFF_ANYCAST) & ~IN6_IFF_TENTATIVE; - if ((ia = in6ifa_ifpforlinklocal(ifp, ignflags)) == NULL) + bound = curlwp_bind(); + ia = in6ifa_ifpforlinklocal_psref(ifp, ignflags, &psref); + if (ia == NULL) { + curlwp_bindx(bound); return; - if ((ia->ia6_flags & IN6_IFF_TENTATIVE)) + } + if ((ia->ia6_flags & IN6_IFF_TENTATIVE)) { + ia6_release(ia, &psref); ia = NULL; + } /* Allocate two mbufs to store IPv6 header and MLD header */ mldh = mld_allocbuf(&mh, sizeof(struct mld_hdr), in6m, type); - if (mldh == NULL) + if (mldh == NULL) { + ia6_release(ia, &psref); + curlwp_bindx(bound); return; + } /* fill src/dst here */ ip6 = mtod(mh, struct ip6_hdr *); ip6->ip6_src = ia ? ia->ia_addr.sin6_addr : in6addr_any; ip6->ip6_dst = dst ? *dst : in6m->in6m_addr; + ia6_release(ia, &psref); + curlwp_bindx(bound); mldh->mld_addr = in6m->in6m_addr; in6_clearscope(&mldh->mld_addr); /* XXX */ @@ -542,7 +568,7 @@ mld_sendpkt(in6m, type, dst) /* construct multicast option */ memset(&im6o, 0, sizeof(im6o)); - im6o.im6o_multicast_ifp = ifp; + im6o.im6o_multicast_if_index = if_get_index(ifp); im6o.im6o_multicast_hlim = 1; /* @@ -552,7 +578,7 @@ mld_sendpkt(in6m, type, dst) 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: @@ -567,15 +593,12 @@ mld_sendpkt(in6m, type, dst) } ip6_output(mh, &ip6_opts, NULL, ia ? 0 : IPV6_UNSPECSRC, - &im6o, (struct socket *)NULL, NULL); + &im6o, NULL, NULL); } static struct mld_hdr * -mld_allocbuf(mh, len, in6m, type) - struct mbuf **mh; - int len; - struct in6_multi *in6m; - int type; +mld_allocbuf(struct mbuf **mh, int len, struct in6_multi *in6m, + int type) { struct mbuf *md; struct mld_hdr *mldh; @@ -598,7 +621,7 @@ mld_allocbuf(mh, len, in6m, type) (*mh)->m_next = md; md->m_next = NULL; - (*mh)->m_pkthdr.rcvif = NULL; + m_reset_rcvif((*mh)); (*mh)->m_pkthdr.len = sizeof(struct ip6_hdr) + len; (*mh)->m_len = sizeof(struct ip6_hdr); MH_ALIGN(*mh, sizeof(struct ip6_hdr)); @@ -626,13 +649,11 @@ mld_allocbuf(mh, len, in6m, type) * Add an address to the list of IP6 multicast addresses for a given interface. */ struct in6_multi * -in6_addmulti(maddr6, ifp, errorp, timer) - struct in6_addr *maddr6; - struct ifnet *ifp; - int *errorp, timer; +in6_addmulti(struct in6_addr *maddr6, struct ifnet *ifp, + int *errorp, int timer) { struct in6_ifaddr *ia; - struct in6_ifreq ifr; + struct sockaddr_in6 sin6; struct in6_multi *in6m; int s = splsoftnet(); @@ -648,63 +669,57 @@ in6_addmulti(maddr6, ifp, errorp, timer) */ in6m->in6m_refcount++; } else { + int _s; /* * New address; allocate a new multicast record * 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); + callout_init(&in6m->in6m_timer_ch, CALLOUT_MPSAFE); + callout_setfunc(&in6m->in6m_timer_ch, mld_timeo, in6m); + + _s = pserialize_read_enter(); + ia = in6_get_ia_from_ifp(ifp); if (ia == NULL) { + pserialize_read_exit(_s); + callout_destroy(&in6m->in6m_timer_ch); free(in6m, M_IPMADDR); splx(s); *errorp = EADDRNOTAVAIL; /* appropriate? */ return (NULL); } in6m->in6m_ia = ia; - IFAREF(&ia->ia_ifa); /* gain a reference */ + ifaref(&ia->ia_ifa); /* gain a reference */ + /* FIXME NOMPSAFE: need to lock */ LIST_INSERT_HEAD(&ia->ia6_multiaddrs, in6m, in6m_entry); + pserialize_read_exit(_s); /* * 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, - (caddr_t)&ifr); + sockaddr_in6_init(&sin6, maddr6, 0, 0, 0); + *errorp = if_mcast_op(ifp, SIOCADDMULTI, sin6tosa(&sin6)); if (*errorp) { + callout_destroy(&in6m->in6m_timer_ch); LIST_REMOVE(in6m, in6m_entry); free(in6m, M_IPMADDR); - IFAFREE(&ia->ia_ifa); + ifafree(&ia->ia_ifa); splx(s); return (NULL); } - callout_init(in6m->in6m_timer_ch); in6m->in6m_timer = timer; if (in6m->in6m_timer > 0) { in6m->in6m_state = MLD_REPORTPENDING; @@ -728,16 +743,17 @@ in6_addmulti(maddr6, ifp, errorp, timer) * Delete a multicast address record. */ void -in6_delmulti(in6m) - struct in6_multi *in6m; +in6_delmulti(struct in6_multi *in6m) { - struct in6_ifreq ifr; + struct sockaddr_in6 sin6; struct in6_ifaddr *ia; int s = splsoftnet(); mld_stoptimer(in6m); if (--in6m->in6m_refcount == 0) { + int _s; + /* * No remaining claims to this record; let MLD6 know * that we are leaving the multicast group. @@ -748,34 +764,41 @@ in6_delmulti(in6m) * Unlink from list. */ LIST_REMOVE(in6m, in6m_entry); - if (in6m->in6m_ia) { - IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ + if (in6m->in6m_ia != NULL) { + ifafree(&in6m->in6m_ia->ia_ifa); /* release reference */ + in6m->in6m_ia = NULL; } /* * Delete all references of this multicasting group from * the membership arrays */ - for (ia = in6_ifaddr; ia; ia = ia->ia_next) { + _s = pserialize_read_enter(); + IN6_ADDRLIST_READER_FOREACH(ia) { struct in6_multi_mship *imm; - LIST_FOREACH(imm, &ia->ia6_memberships, - i6mm_chain) { + LIST_FOREACH(imm, &ia->ia6_memberships, i6mm_chain) { if (imm->i6mm_maddr == in6m) imm->i6mm_maddr = NULL; } } + pserialize_read_exit(_s); /* * 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, (caddr_t)&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)); + + /* Tell mld_timeo we're halting the timer */ + in6m->in6m_timer = IN6M_TIMER_UNDEF; +#ifdef NET_MPSAFE + callout_halt(&in6m->in6m_timer_ch, NULL); +#else + callout_halt(&in6m->in6m_timer_ch, softnet_lock); +#endif + callout_destroy(&in6m->in6m_timer_ch); + free(in6m, M_IPMADDR); } splx(s); @@ -783,23 +806,20 @@ in6_delmulti(in6m) struct in6_multi_mship * -in6_joingroup(ifp, addr, errorp, timer) - struct ifnet *ifp; - struct in6_addr *addr; - int *errorp, timer; +in6_joingroup(struct ifnet *ifp, struct in6_addr *addr, + int *errorp, int timer) { 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 alrady set */ + /* *errorp is already set */ free(imm, M_IPMADDR); return NULL; } @@ -807,8 +827,7 @@ in6_joingroup(ifp, addr, errorp, timer) } int -in6_leavegroup(imm) - struct in6_multi_mship *imm; +in6_leavegroup(struct in6_multi_mship *imm) { if (imm->i6mm_maddr) { @@ -826,38 +845,42 @@ in6_leavegroup(imm) * such time as this interface is reconfigured for IPv6. */ void -in6_savemkludge(oia) - struct in6_ifaddr *oia; +in6_savemkludge(struct in6_ifaddr *oia) { struct in6_ifaddr *ia; - struct in6_multi *in6m, *next; + struct in6_multi *in6m; + int s; - IFP_TO_IA6(oia->ia_ifp, ia); + s = pserialize_read_enter(); + ia = in6_get_ia_from_ifp(oia->ia_ifp); if (ia) { /* there is another address */ - for (in6m = oia->ia6_multiaddrs.lh_first; in6m; in6m = next) { - next = in6m->in6m_entry.le_next; - IFAFREE(&in6m->in6m_ia->ia_ifa); - IFAREF(&ia->ia_ifa); + KASSERT(ia != oia); + while ((in6m = LIST_FIRST(&oia->ia6_multiaddrs)) != NULL) { + LIST_REMOVE(in6m, in6m_entry); + ifaref(&ia->ia_ifa); + ifafree(&in6m->in6m_ia->ia_ifa); in6m->in6m_ia = ia; + /* FIXME NOMPSAFE: need to lock */ LIST_INSERT_HEAD(&ia->ia6_multiaddrs, in6m, in6m_entry); } } else { /* last address on this if deleted, save */ struct multi6_kludge *mk; - for (mk = in6_mk.lh_first; mk; mk = mk->mk_entry.le_next) { + LIST_FOREACH(mk, &in6_mk, mk_entry) { if (mk->mk_ifp == oia->ia_ifp) break; } if (mk == NULL) /* this should not happen! */ panic("in6_savemkludge: no kludge space"); - for (in6m = oia->ia6_multiaddrs.lh_first; in6m; in6m = next) { - next = in6m->in6m_entry.le_next; - IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ + while ((in6m = LIST_FIRST(&oia->ia6_multiaddrs)) != NULL) { + LIST_REMOVE(in6m, in6m_entry); + ifafree(&in6m->in6m_ia->ia_ifa); /* release reference */ in6m->in6m_ia = NULL; LIST_INSERT_HEAD(&mk->mk_head, in6m, in6m_entry); } } + pserialize_read_exit(s); } /* @@ -866,26 +889,22 @@ in6_savemkludge(oia) * then we re-attach it to the first address configured on the i/f. */ void -in6_restoremkludge(ia, ifp) - struct in6_ifaddr *ia; - struct ifnet *ifp; +in6_restoremkludge(struct in6_ifaddr *ia, struct ifnet *ifp) { struct multi6_kludge *mk; + struct in6_multi *in6m; - for (mk = in6_mk.lh_first; mk; mk = mk->mk_entry.le_next) { - if (mk->mk_ifp == ifp) { - struct in6_multi *in6m, *next; - - for (in6m = mk->mk_head.lh_first; in6m; in6m = next) { - next = in6m->in6m_entry.le_next; - in6m->in6m_ia = ia; - IFAREF(&ia->ia_ifa); - LIST_INSERT_HEAD(&ia->ia6_multiaddrs, - in6m, in6m_entry); - } - LIST_INIT(&mk->mk_head); + LIST_FOREACH(mk, &in6_mk, mk_entry) { + if (mk->mk_ifp == ifp) break; - } + } + if (mk == NULL) + return; + while ((in6m = LIST_FIRST(&mk->mk_head)) != NULL) { + LIST_REMOVE(in6m, in6m_entry); + in6m->in6m_ia = ia; + ifaref(&ia->ia_ifa); + LIST_INSERT_HEAD(&ia->ia6_multiaddrs, in6m, in6m_entry); } } @@ -901,42 +920,208 @@ in6_restoremkludge(ia, ifp) * it is a global function. */ void -in6_createmkludge(ifp) - struct ifnet *ifp; +in6_createmkludge(struct ifnet *ifp) { struct multi6_kludge *mk; - for (mk = in6_mk.lh_first; mk; mk = mk->mk_entry.le_next) { + LIST_FOREACH(mk, &in6_mk, mk_entry) { /* If we've already had one, do not allocate. */ if (mk->mk_ifp == 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); } void -in6_purgemkludge(ifp) - struct ifnet *ifp; +in6_purgemkludge(struct ifnet *ifp) +{ + struct multi6_kludge *mk; + struct in6_multi *in6m, *next; + + LIST_FOREACH(mk, &in6_mk, mk_entry) { + if (mk->mk_ifp == ifp) + break; + } + if (mk == NULL) + return; + + /* leave from all multicast groups joined */ + for (in6m = LIST_FIRST(&mk->mk_head); in6m != NULL; in6m = next) { + next = LIST_NEXT(in6m, in6m_entry); + in6_delmulti(in6m); + } + 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; + struct psref psref, psref_ia; + int bound, s; + + if (namelen != 1) + return EINVAL; + + bound = curlwp_bind(); + ifp = if_get_byindex(name[0], &psref); + if (ifp == NULL) { + curlwp_bindx(bound); + return ENODEV; + } + + if (oldp == NULL) { + *oldlenp = 0; + s = pserialize_read_enter(); + IFADDR_READER_FOREACH(ifa, ifp) { + 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); + } + } + pserialize_read_exit(s); + if_put(ifp, &psref); + curlwp_bindx(bound); + return 0; + } - for (mk = in6_mk.lh_first; mk; mk = mk->mk_entry.le_next) { - if (mk->mk_ifp != ifp) + error = 0; + written = 0; + s = pserialize_read_enter(); + IFADDR_READER_FOREACH(ifa, ifp) { + if (ifa->ifa_addr->sa_family != AF_INET6) continue; - /* leave from all multicast groups joined */ - while ((in6m = LIST_FIRST(&mk->mk_head)) != NULL) { - in6_delmulti(in6m); + ifa_acquire(ifa, &psref_ia); + pserialize_read_exit(s); + + 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); } - LIST_REMOVE(mk, mk_entry); - free(mk, M_IPMADDR); - break; + + s = pserialize_read_enter(); + ifa_release(ifa, &psref_ia); } + pserialize_read_exit(s); +done: + ifa_release(ifa, &psref_ia); + if_put(ifp, &psref); + curlwp_bindx(bound); + *oldlenp = written; + return error; +} + +void +in6_sysctl_multicast_setup(struct sysctllog **clog) +{ + + 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); }