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.30.2.1 retrieving revision 1.37.2.4 diff -u -p -r1.30.2.1 -r1.37.2.4 --- src/sys/netinet6/mld6.c 2006/03/13 09:07:39 1.30.2.1 +++ src/sys/netinet6/mld6.c 2007/10/23 20:17:22 1.37.2.4 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.30.2.1 2006/03/13 09:07:39 yamt Exp $ */ +/* $NetBSD: mld6.c,v 1.37.2.4 2007/10/23 20:17:22 ad 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.30.2.1 2006/03/13 09:07:39 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.37.2.4 2007/10/23 20:17:22 ad Exp $"); #include "opt_inet.h" @@ -163,7 +163,6 @@ 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 @@ -181,7 +180,7 @@ 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)); + bcopy((void *)&rtalert_code, &hbh_buf[6], sizeof(u_int16_t)); ip6_opts.ip6po_hbh = hbh; /* We will specify the hoplimit by a multicast option. */ @@ -189,8 +188,7 @@ mld_init() } static void -mld_starttimer(in6m) - struct in6_multi *in6m; +mld_starttimer(struct in6_multi *in6m) { struct timeval now; @@ -204,32 +202,28 @@ 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) { + struct in6_multi *in6m = arg; int s = splsoftnet(); in6m->in6m_timer = IN6M_TIMER_UNDEF; - callout_stop(in6m->in6m_timer_ch); - switch (in6m->in6m_state) { case MLD_REPORTPENDING: mld_start_listening(in6m); @@ -243,8 +237,7 @@ mld_timeo(in6m) } static u_long -mld_timerresid(in6m) - struct in6_multi *in6m; +mld_timerresid(struct in6_multi *in6m) { struct timeval now, diff; @@ -268,8 +261,7 @@ mld_timerresid(in6m) } static void -mld_start_listening(in6m) - struct in6_multi *in6m; +mld_start_listening(struct in6_multi *in6m) { struct in6_addr all_in6; @@ -301,8 +293,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,9 +317,7 @@ 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 mld_hdr *mldh; @@ -428,10 +417,7 @@ mld_input(m, off) if (ia == NULL) break; - for (in6m = ia->ia6_multiaddrs.lh_first; - in6m; - in6m = in6m->in6m_entry.le_next) - { + 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) @@ -500,10 +486,8 @@ mld_input(m, off) } 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; @@ -571,11 +555,8 @@ mld_sendpkt(in6m, type, dst) } 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; @@ -626,10 +607,8 @@ 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; @@ -665,13 +644,6 @@ in6_addmulti(maddr6, ifp, errorp, timer) 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) { free(in6m, M_IPMADDR); @@ -687,15 +659,12 @@ in6_addmulti(maddr6, ifp, errorp, timer) * 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; + sockaddr_in6_init(&ifr.ifr_addr, maddr6, 0, 0, 0); if (ifp->if_ioctl == NULL) *errorp = ENXIO; /* XXX: appropriate? */ else *errorp = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, - (caddr_t)&ifr); + (void *)&ifr); if (*errorp) { LIST_REMOVE(in6m, in6m_entry); free(in6m, M_IPMADDR); @@ -704,7 +673,8 @@ in6_addmulti(maddr6, ifp, errorp, timer) return (NULL); } - callout_init(in6m->in6m_timer_ch); + callout_init(&in6m->in6m_timer_ch, 0); + callout_setfunc(&in6m->in6m_timer_ch, mld_timeo, in6m); in6m->in6m_timer = timer; if (in6m->in6m_timer > 0) { in6m->in6m_state = MLD_REPORTPENDING; @@ -728,8 +698,7 @@ 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 in6_ifaddr *ia; @@ -748,8 +717,9 @@ in6_delmulti(in6m) * Unlink from list. */ LIST_REMOVE(in6m, in6m_entry); - if (in6m->in6m_ia) { + if (in6m->in6m_ia != NULL) { IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ + in6m->in6m_ia = NULL; } /* @@ -758,8 +728,7 @@ in6_delmulti(in6m) */ for (ia = in6_ifaddr; ia; ia = ia->ia_next) { 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; } @@ -769,13 +738,10 @@ in6_delmulti(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; + sockaddr_in6_init(&ifr.ifr_addr, &in6m->in6m_addr, 0, 0, 0); (*in6m->in6m_ifp->if_ioctl)(in6m->in6m_ifp, - SIOCDELMULTI, (caddr_t)&ifr); - free(in6m->in6m_timer_ch, M_IPMADDR); + SIOCDELMULTI, (void *)&ifr); + callout_destroy(&in6m->in6m_timer_ch); free(in6m, M_IPMADDR); } splx(s); @@ -783,10 +749,8 @@ 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; @@ -799,7 +763,7 @@ in6_joingroup(ifp, addr, errorp, timer) 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 +771,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,33 +789,33 @@ 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; IFP_TO_IA6(oia->ia_ifp, ia); 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); + 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; 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; + 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); @@ -866,26 +829,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,12 +860,11 @@ 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; @@ -921,22 +879,23 @@ in6_createmkludge(ifp) } void -in6_purgemkludge(ifp) - struct ifnet *ifp; +in6_purgemkludge(struct ifnet *ifp) { struct multi6_kludge *mk; - struct in6_multi *in6m; + struct in6_multi *in6m, *next; - for (mk = in6_mk.lh_first; mk; mk = mk->mk_entry.le_next) { - if (mk->mk_ifp != ifp) - continue; - - /* leave from all multicast groups joined */ - while ((in6m = LIST_FIRST(&mk->mk_head)) != NULL) { - in6_delmulti(in6m); - } - LIST_REMOVE(mk, mk_entry); - free(mk, M_IPMADDR); - break; + 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); }