Attachment 51279 Details for Bug 77934 – file.diff

[patch] file.diff

file.diff (text/plain), 1.68 KB, created by Gerd Rausch on 2005-02-22 20:00:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerd Rausch

Created: 2005-02-22 20:00:35 UTC

Size: 1.68 KB

patch

obsolete

>--- sys/netinet6/icmp6.c	Sun Mar 28 07:13:37 2004
>+++ ../../x/src/sys/netinet6/icmp6.c	Tue Feb 22 11:26:44 2005
>@@ -167,7 +167,7 @@ static int ni6_addrs __P((struct icmp6_n
> 			  struct ifnet **, char *));
> static int ni6_store_addrs __P((struct icmp6_nodeinfo *, struct icmp6_nodeinfo *,
> 				struct ifnet *, int));
>-static int icmp6_notify_error __P((struct mbuf *, int, int, int));
>+static int icmp6_notify_error __P((struct mbuf **, int, int, int));
> 
> #ifdef COMPAT_RFC1885
> static struct route_in6 icmp6_reflect_rt;
>@@ -846,7 +846,7 @@ icmp6_input(mp, offp, proto)
> 			break;
> 		}
> 	deliver:
>-		if (icmp6_notify_error(m, off, icmp6len, code)) {
>+		if (icmp6_notify_error(&m, off, icmp6len, code)) {
> 			/* In this case, m should've been freed. */
> 			return(IPPROTO_DONE);
> 		}
>@@ -872,10 +872,11 @@ icmp6_input(mp, offp, proto)
> }
> 
> static int
>-icmp6_notify_error(m, off, icmp6len, code)
>-	struct mbuf *m;
>+icmp6_notify_error(mp, off, icmp6len, code)
>+	struct mbuf **mp;
> 	int off, icmp6len;
> {
>+ 	struct mbuf *m = *mp;
> 	struct icmp6_hdr *icmp6;
> 	struct ip6_hdr *eip6;
> 	u_int32_t notifymtu;
>@@ -1114,6 +1115,7 @@ icmp6_notify_error(m, off, icmp6len, cod
> 					  &ip6cp);
> 		}
> 	}
>+	*mp = m;
> 	return(0);
> 
>   freeit:
>--- sys/netinet6/ip6_output.c	Sun Mar 28 07:11:57 2004
>+++ ../../x/src/sys/netinet6/ip6_output.c	Tue Feb 22 11:25:08 2005
>@@ -857,8 +857,8 @@ skip_ipsec2:;
> 	 */
> 	if (exthdrs.ip6e_hbh) {
> 		struct ip6_hbh *hbh = mtod(exthdrs.ip6e_hbh, struct ip6_hbh *);
>-		u_int32_t dummy1; /* XXX unused */
>-		u_int32_t dummy2; /* XXX unused */
>+		u_int32_t dummy1 = 0; /* XXX unused */
>+		u_int32_t dummy2 = 0; /* XXX unused */
> 
> #ifdef DIAGNOSTIC
> 		if ((hbh->ip6h_len + 1) << 3 > exthdrs.ip6e_hbh->m_len)

Actions: View | Diff

Attachments on bug 77934: 51279