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.35 retrieving revision 1.45.2.1 diff -u -p -r1.35 -r1.45.2.1 --- src/sys/netinet6/mld6.c 2006/11/20 04:26:22 1.35 +++ src/sys/netinet6/mld6.c 2009/05/04 08:14:19 1.45.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.35 2006/11/20 04:26:22 dyoung Exp $ */ +/* $NetBSD: mld6.c,v 1.45.2.1 2009/05/04 08:14:19 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.35 2006/11/20 04:26:22 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.45.2.1 2009/05/04 08:14:19 yamt Exp $"); #include "opt_inet.h" @@ -110,6 +110,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.3 #include #include #include +#include #include #include #include @@ -125,6 +126,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.3 #include #include #include +#include #include #include @@ -163,11 +165,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 +182,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)); + 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. */ @@ -189,8 +190,7 @@ mld_init() } static void -mld_starttimer(in6m) - struct in6_multi *in6m; +mld_starttimer(struct in6_multi *in6m) { struct timeval now; @@ -204,31 +204,29 @@ 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); + in6m->in6m_timer = IN6M_TIMER_UNDEF; switch (in6m->in6m_state) { case MLD_REPORTPENDING: @@ -239,12 +237,12 @@ mld_timeo(in6m) break; } - splx(s); + 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 +262,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; @@ -301,8 +298,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 +322,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; @@ -336,11 +330,11 @@ mld_input(m, off) 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; } @@ -447,9 +441,9 @@ 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 + (arc4random() % timer) * hz / 1000; mld_starttimer(in6m); } } @@ -497,10 +491,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; @@ -549,7 +541,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: @@ -620,10 +612,8 @@ mld_allocbuf(struct mbuf **mh, int len, * 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; @@ -659,13 +649,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); @@ -681,15 +664,8 @@ 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; - if (ifp->if_ioctl == NULL) - *errorp = ENXIO; /* XXX: appropriate? */ - else - *errorp = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, - (caddr_t)&ifr); + sockaddr_in6_init(&ifr.ifr_addr, maddr6, 0, 0, 0); + *errorp = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, &ifr); if (*errorp) { LIST_REMOVE(in6m, in6m_entry); free(in6m, M_IPMADDR); @@ -698,7 +674,8 @@ in6_addmulti(maddr6, ifp, errorp, timer) return (NULL); } - callout_init(in6m->in6m_timer_ch); + 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; @@ -722,8 +699,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; @@ -763,13 +739,9 @@ 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; - (*in6m->in6m_ifp->if_ioctl)(in6m->in6m_ifp, - SIOCDELMULTI, (caddr_t)&ifr); - free(in6m->in6m_timer_ch, M_IPMADDR); + sockaddr_in6_init(&ifr.ifr_addr, &in6m->in6m_addr, 0, 0, 0); + (*in6m->in6m_ifp->if_ioctl)(in6m->in6m_ifp, SIOCDELMULTI, &ifr); + callout_destroy(&in6m->in6m_timer_ch); free(in6m, M_IPMADDR); } splx(s); @@ -777,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; @@ -793,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; } @@ -801,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) { @@ -820,20 +789,18 @@ 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 = LIST_FIRST(&oia->ia6_multiaddrs); - in6m != NULL; - in6m = next) { - next = LIST_NEXT(in6m, in6m_entry); - 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); } @@ -847,10 +814,8 @@ in6_savemkludge(oia) if (mk == NULL) /* this should not happen! */ panic("in6_savemkludge: no kludge space"); - for (in6m = LIST_FIRST(&oia->ia6_multiaddrs); - in6m != NULL; - in6m = next) { - next = LIST_NEXT(in6m, in6m_entry); + 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); @@ -864,12 +829,10 @@ 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, *next; + struct in6_multi *in6m; LIST_FOREACH(mk, &in6_mk, mk_entry) { if (mk->mk_ifp == ifp) @@ -877,13 +840,12 @@ in6_restoremkludge(ia, ifp) } if (mk == NULL) return; - for (in6m = LIST_FIRST(&mk->mk_head); in6m != NULL; in6m = next) { - next = LIST_NEXT(in6m, in6m_entry); + 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); } - LIST_INIT(&mk->mk_head); } /* @@ -898,8 +860,7 @@ 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; @@ -918,11 +879,10 @@ 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; LIST_FOREACH(mk, &in6_mk, mk_entry) { if (mk->mk_ifp == ifp) @@ -932,7 +892,8 @@ in6_purgemkludge(ifp) return; /* leave from all multicast groups joined */ - while ((in6m = LIST_FIRST(&mk->mk_head)) != NULL) { + 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);