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.27.4.2 retrieving revision 1.30.2.1 diff -u -p -r1.27.4.2 -r1.30.2.1 --- src/sys/netinet6/mld6.c 2006/12/30 20:50:39 1.27.4.2 +++ src/sys/netinet6/mld6.c 2006/03/13 09:07:39 1.30.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.27.4.2 2006/12/30 20:50:39 yamt Exp $ */ +/* $NetBSD: mld6.c,v 1.30.2.1 2006/03/13 09:07:39 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.27.4.2 2006/12/30 20:50:39 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.30.2.1 2006/03/13 09:07:39 yamt Exp $"); #include "opt_inet.h" @@ -428,7 +428,10 @@ mld_input(m, off) if (ia == NULL) break; - LIST_FOREACH(in6m, &ia->ia6_multiaddrs, in6m_entry) { + for (in6m = ia->ia6_multiaddrs.lh_first; + in6m; + in6m = in6m->in6m_entry.le_next) + { if (IN6_ARE_ADDR_EQUAL(&in6m->in6m_addr, &all_in6) || IPV6_ADDR_MC_SCOPE(&in6m->in6m_addr) < IPV6_ADDR_SCOPE_LINKLOCAL) @@ -568,8 +571,11 @@ mld_sendpkt(in6m, type, dst) } static struct mld_hdr * -mld_allocbuf(struct mbuf **mh, int len, struct in6_multi *in6m, - int type) +mld_allocbuf(mh, len, in6m, type) + struct mbuf **mh; + int len; + struct in6_multi *in6m; + int type; { struct mbuf *md; struct mld_hdr *mldh; @@ -668,7 +674,6 @@ in6_addmulti(maddr6, ifp, errorp, timer) } IFP_TO_IA6(ifp, ia); if (ia == NULL) { - /* leaks in6m_timer_ch */ free(in6m, M_IPMADDR); splx(s); *errorp = EADDRNOTAVAIL; /* appropriate? */ @@ -693,7 +698,6 @@ in6_addmulti(maddr6, ifp, errorp, timer) (caddr_t)&ifr); if (*errorp) { LIST_REMOVE(in6m, in6m_entry); - /* leaks in6m_timer_ch */ free(in6m, M_IPMADDR); IFAFREE(&ia->ia_ifa); splx(s); @@ -744,9 +748,8 @@ in6_delmulti(in6m) * Unlink from list. */ LIST_REMOVE(in6m, in6m_entry); - if (in6m->in6m_ia != NULL) { + if (in6m->in6m_ia) { IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ - in6m->in6m_ia = NULL; } /* @@ -755,7 +758,8 @@ 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; } @@ -795,7 +799,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 already set */ + /* *errorp is alrady set */ free(imm, M_IPMADDR); return NULL; } @@ -826,30 +830,29 @@ in6_savemkludge(oia) struct in6_ifaddr *oia; { struct in6_ifaddr *ia; - struct in6_multi *in6m; + struct in6_multi *in6m, *next; IFP_TO_IA6(oia->ia_ifp, ia); if (ia) { /* there is another address */ - KASSERT(ia != oia); - while ((in6m = LIST_FIRST(&oia->ia6_multiaddrs)) != NULL) { - LIST_REMOVE(in6m, in6m_entry); - IFAREF(&ia->ia_ifa); + 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); 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; - LIST_FOREACH(mk, &in6_mk, mk_entry) { + for (mk = in6_mk.lh_first; mk; mk = mk->mk_entry.le_next) { if (mk->mk_ifp == oia->ia_ifp) break; } if (mk == NULL) /* this should not happen! */ panic("in6_savemkludge: no kludge space"); - while ((in6m = LIST_FIRST(&oia->ia6_multiaddrs)) != NULL) { - LIST_REMOVE(in6m, in6m_entry); + for (in6m = oia->ia6_multiaddrs.lh_first; in6m; in6m = next) { + next = in6m->in6m_entry.le_next; IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ in6m->in6m_ia = NULL; LIST_INSERT_HEAD(&mk->mk_head, in6m, in6m_entry); @@ -868,19 +871,21 @@ in6_restoremkludge(ia, ifp) struct ifnet *ifp; { struct multi6_kludge *mk; - struct in6_multi *in6m; - LIST_FOREACH(mk, &in6_mk, mk_entry) { - if (mk->mk_ifp == ifp) + 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); 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,7 +906,7 @@ in6_createmkludge(ifp) { struct multi6_kludge *mk; - LIST_FOREACH(mk, &in6_mk, mk_entry) { + for (mk = in6_mk.lh_first; mk; mk = mk->mk_entry.le_next) { /* If we've already had one, do not allocate. */ if (mk->mk_ifp == ifp) return; @@ -920,20 +925,18 @@ in6_purgemkludge(ifp) 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; + struct in6_multi *in6m; - /* 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); + 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_REMOVE(mk, mk_entry); - free(mk, M_IPMADDR); }