Attachment 15892 Details for Bug 29345 – file.diff

[patch] file.diff

file.diff (text/plain), 3.00 KB, created by inoue on 2001-07-31 09:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: inoue

Created: 2001-07-31 09:30:01 UTC

Size: 3.00 KB

patch

obsolete

>diff -uNr netinet6/in6_ifattach.c /usr/src/sys/netinet6/in6_ifattach.c
>--- netinet6/in6_ifattach.c	Tue Jul 31 14:04:47 2001
>+++ /usr/src/sys/netinet6/in6_ifattach.c	Tue Jul 31 12:55:52 2001
>@@ -47,10 +47,12 @@
> #include <netinet/in.h>
> #include <netinet/in_var.h>
> #include <netinet/if_ether.h>
>+#include <netinet/in_pcb.h>
> 
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet6/in6_var.h>
>+#include <netinet6/in6_pcb.h>
> #include <netinet6/in6_ifattach.h>
> #include <netinet6/ip6_var.h>
> #include <netinet6/nd6.h>
>@@ -72,6 +74,9 @@
> 
> struct callout in6_tmpaddrtimer_ch;
> 
>+extern struct inpcbinfo udbinfo;
>+extern struct inpcbinfo ripcbinfo;
>+
> static int get_rand_ifid __P((struct ifnet *, struct in6_addr *));
> static int generate_tmp_ifid __P((u_int8_t *, const u_int8_t *, u_int8_t *));
> static int get_hw_ifid __P((struct ifnet *, struct in6_addr *));
>@@ -942,6 +947,8 @@
> 	}
> 
> 	/* leave from all multicast groups joined */
>+	in6_pcbpurgeif0(LIST_FIRST(udbinfo.listhead), ifp);
>+	in6_pcbpurgeif0(LIST_FIRST(ripcbinfo.listhead), ifp);
> 	for (in6m = LIST_FIRST(&in6_multihead); in6m; in6m = in6m_next) {
> 		in6m_next = LIST_NEXT(in6m, in6m_entry);
> 		if (in6m->in6m_ifp != ifp)
>diff -uNr netinet6/in6_pcb.c /usr/src/sys/netinet6/in6_pcb.c
>--- netinet6/in6_pcb.c	Tue Jul 31 14:04:47 2001
>+++ /usr/src/sys/netinet6/in6_pcb.c	Tue Jul 31 12:53:10 2001
>@@ -932,6 +932,45 @@
> 	}
> }
> 
>+void
>+in6_pcbpurgeif0(head, ifp)
>+	struct in6pcb *head;
>+	struct ifnet *ifp;
>+{
>+	struct in6pcb *in6p;
>+	struct ip6_moptions *im6o;
>+	struct in6_multi_mship *imm, *nimm;
>+
>+	for (in6p = head; in6p != NULL; in6p = LIST_NEXT(in6p, inp_list)) {
>+		im6o = in6p->in6p_moptions;
>+		if ((in6p->inp_vflag & INP_IPV6) &&
>+		    im6o) {
>+			/*
>+			 * Unselect the outgoing interface if it is being
>+			 * detached.
>+			 */
>+			if (im6o->im6o_multicast_ifp == ifp)
>+				im6o->im6o_multicast_ifp = NULL;
>+
>+			/*
>+			 * Drop multicast group membership if we joined
>+			 * through the interface being detached.
>+			 * XXX controversial - is it really legal for kernel
>+			 * to force this?
>+			 */
>+			for (imm = im6o->im6o_memberships.lh_first;
>+			     imm != NULL; imm = nimm) {
>+				nimm = imm->i6mm_chain.le_next;
>+				if (imm->i6mm_maddr->in6m_ifp == ifp) {
>+					LIST_REMOVE(imm, i6mm_chain);
>+					in6_delmulti(imm->i6mm_maddr);
>+					free(imm, M_IPMADDR);
>+				}
>+			}
>+		}
>+	}
>+}
>+
> /*
>  * Check for alternatives when higher level complains
>  * about service problems.  For now, invalidate cached
>diff -uNr netinet6/in6_pcb.h /usr/src/sys/netinet6/in6_pcb.h
>--- netinet6/in6_pcb.h	Tue Jul 31 14:04:47 2001
>+++ /usr/src/sys/netinet6/in6_pcb.h	Tue Jul 31 12:53:10 2001
>@@ -74,6 +74,7 @@
> #define	sin6tosa(sin6)	((struct sockaddr *)(sin6))
> #define	ifatoia6(ifa)	((struct in6_ifaddr *)(ifa))
> 
>+void	in6_pcbpurgeif0 __P((struct in6pcb *, struct ifnet *));
> void	in6_losing __P((struct inpcb *));
> int	in6_pcballoc __P((struct socket *, struct inpcbinfo *, struct proc *));
> int	in6_pcbbind __P((struct inpcb *, struct sockaddr *, struct proc *));
>--- netinet6.patch ---

Actions: View | Diff

Attachments on bug 29345: 15891 | 15892