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.3
retrieving revision 1.32
diff -u -p -r1.27.4.3 -r1.32
--- src/sys/netinet6/mld6.c	2007/09/03 14:43:40	1.27.4.3
+++ src/sys/netinet6/mld6.c	2006/03/06 20:33:52	1.32
@@ -1,4 +1,4 @@
-/*	$NetBSD: mld6.c,v 1.27.4.3 2007/09/03 14:43:40 yamt Exp $	*/
+/*	$NetBSD: mld6.c,v 1.32 2006/03/06 20:33:52 rpaulo Exp $	*/
 /*	$KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.27.4.3 2007/09/03 14:43:40 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.32 2006/03/06 20:33:52 rpaulo Exp $");
 
 #include "opt_inet.h"
 
@@ -181,7 +181,7 @@ mld_init()
 	hbh_buf[3] = 0;
 	hbh_buf[4] = IP6OPT_RTALERT;
 	hbh_buf[5] = IP6OPT_RTALERT_LEN - 2;
-	bcopy((void *)&rtalert_code, &hbh_buf[6], sizeof(u_int16_t));
+	bcopy((caddr_t)&rtalert_code, &hbh_buf[6], sizeof(u_int16_t));
 
 	ip6_opts.ip6po_hbh = hbh;
 	/* We will specify the hoplimit by a multicast option. */
@@ -189,7 +189,8 @@ mld_init()
 }
 
 static void
-mld_starttimer(struct in6_multi *in6m)
+mld_starttimer(in6m)
+	struct in6_multi *in6m;
 {
 	struct timeval now;
 
@@ -208,7 +209,8 @@ mld_starttimer(struct in6_multi *in6m)
 }
 
 static void
-mld_stoptimer(struct in6_multi *in6m)
+mld_stoptimer(in6m)
+	struct in6_multi *in6m;
 {
 	if (in6m->in6m_timer == IN6M_TIMER_UNDEF)
 		return;
@@ -219,7 +221,8 @@ mld_stoptimer(struct in6_multi *in6m)
 }
 
 static void
-mld_timeo(struct in6_multi *in6m)
+mld_timeo(in6m)
+	struct in6_multi *in6m;
 {
 	int s = splsoftnet();
 
@@ -240,7 +243,8 @@ mld_timeo(struct in6_multi *in6m)
 }
 
 static u_long
-mld_timerresid(struct in6_multi *in6m)
+mld_timerresid(in6m)
+	struct in6_multi *in6m;
 {
 	struct timeval now, diff;
 
@@ -264,7 +268,8 @@ mld_timerresid(struct in6_multi *in6m)
 }
 
 static void
-mld_start_listening(struct in6_multi *in6m)
+mld_start_listening(in6m)
+	struct in6_multi *in6m;
 {
 	struct in6_addr all_in6;
 
@@ -296,7 +301,8 @@ mld_start_listening(struct in6_multi *in
 }
 
 static void
-mld_stop_listening(struct in6_multi *in6m)
+mld_stop_listening(in6m)
+	struct in6_multi *in6m;
 {
 	struct in6_addr allnode, allrouter;
 
@@ -320,7 +326,9 @@ mld_stop_listening(struct in6_multi *in6
 }
 
 void
-mld_input(struct mbuf *m, int off)
+mld_input(m, off)
+	struct mbuf *m;
+	int off;
 {
 	struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
 	struct mld_hdr *mldh;
@@ -420,7 +428,10 @@ mld_input(struct mbuf *m, int 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)
@@ -489,8 +500,10 @@ mld_input(struct mbuf *m, int off)
 }
 
 static void
-mld_sendpkt(struct in6_multi *in6m, int type, 
-	const struct in6_addr *dst)
+mld_sendpkt(in6m, type, dst)
+	struct in6_multi *in6m;
+	int type;
+	const struct in6_addr *dst;
 {
 	struct mbuf *mh;
 	struct mld_hdr *mldh;
@@ -558,8 +571,11 @@ mld_sendpkt(struct in6_multi *in6m, int 
 }
 
 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;
@@ -610,8 +626,10 @@ 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(struct in6_addr *maddr6, struct ifnet *ifp, 
-	int *errorp, int timer)
+in6_addmulti(maddr6, ifp, errorp, timer)
+	struct in6_addr *maddr6;
+	struct ifnet *ifp;
+	int *errorp, timer;
 {
 	struct	in6_ifaddr *ia;
 	struct	in6_ifreq ifr;
@@ -656,7 +674,6 @@ in6_addmulti(struct in6_addr *maddr6, st
 		}
 		IFP_TO_IA6(ifp, ia);
 		if (ia == NULL) {
-			/* leaks in6m_timer_ch */
 			free(in6m, M_IPMADDR);
 			splx(s);
 			*errorp = EADDRNOTAVAIL; /* appropriate? */
@@ -670,22 +687,24 @@ 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);
+		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,
-			    (void *)&ifr);
+			    (caddr_t)&ifr);
 		if (*errorp) {
 			LIST_REMOVE(in6m, in6m_entry);
-			/* leaks in6m_timer_ch */
 			free(in6m, M_IPMADDR);
 			IFAFREE(&ia->ia_ifa);
 			splx(s);
 			return (NULL);
 		}
 
-		callout_init(in6m->in6m_timer_ch, 0);
+		callout_init(in6m->in6m_timer_ch);
 		in6m->in6m_timer = timer;
 		if (in6m->in6m_timer > 0) {
 			in6m->in6m_state = MLD_REPORTPENDING;
@@ -709,7 +728,8 @@ in6_addmulti(struct in6_addr *maddr6, st
  * Delete a multicast address record.
  */
 void
-in6_delmulti(struct in6_multi *in6m)
+in6_delmulti(in6m)
+	struct in6_multi *in6m;
 {
 	struct	in6_ifreq ifr;
 	struct	in6_ifaddr *ia;
@@ -728,9 +748,8 @@ in6_delmulti(struct in6_multi *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;
 		}
 
 		/*
@@ -739,7 +758,8 @@ in6_delmulti(struct in6_multi *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;
 			}
@@ -749,9 +769,12 @@ 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);
+		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, (void *)&ifr);
+		    SIOCDELMULTI, (caddr_t)&ifr);
 		free(in6m->in6m_timer_ch, M_IPMADDR);
 		free(in6m, M_IPMADDR);
 	}
@@ -760,8 +783,10 @@ in6_delmulti(struct in6_multi *in6m)
 
 
 struct in6_multi_mship *
-in6_joingroup(struct ifnet *ifp, struct in6_addr *addr, 
-	int *errorp, int timer)
+in6_joingroup(ifp, addr, errorp, timer)
+	struct ifnet *ifp;
+	struct in6_addr *addr;
+	int *errorp, timer;
 {
 	struct in6_multi_mship *imm;
 
@@ -774,7 +799,7 @@ in6_joingroup(struct ifnet *ifp, struct 
 	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;
 	}
@@ -782,7 +807,8 @@ in6_joingroup(struct ifnet *ifp, struct 
 }
 
 int
-in6_leavegroup(struct in6_multi_mship *imm)
+in6_leavegroup(imm)
+	struct in6_multi_mship *imm;
 {
 
 	if (imm->i6mm_maddr) {
@@ -800,33 +826,33 @@ in6_leavegroup(struct in6_multi_mship *i
  * such time as this interface is reconfigured for IPv6.
  */
 void
-in6_savemkludge(struct in6_ifaddr *oia)
+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);
@@ -840,22 +866,26 @@ in6_savemkludge(struct in6_ifaddr *oia)
  * then we re-attach it to the first address configured on the i/f.
  */
 void
-in6_restoremkludge(struct in6_ifaddr *ia, struct ifnet *ifp)
+in6_restoremkludge(ia, ifp)
+	struct in6_ifaddr *ia;
+	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);
+		}
 	}
 }
 
@@ -871,11 +901,12 @@ in6_restoremkludge(struct in6_ifaddr *ia
  * it is a global function.
  */
 void
-in6_createmkludge(struct ifnet *ifp)
+in6_createmkludge(ifp)
+	struct ifnet *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;
@@ -890,23 +921,22 @@ in6_createmkludge(struct ifnet *ifp)
 }
 
 void
-in6_purgemkludge(struct ifnet *ifp)
+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);
 }