Attachment 260331 Details for Bug 287471 – new patch

[patch] new patch

icmp-stats.patch (text/plain), 2.16 KB, created by Neil Horman on 2007-11-15 19:45:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-11-15 19:45:21 UTC

Size: 2.16 KB

patch

obsolete

>--- linux-2.6.18.noarch/include/linux/snmp.h.orig	2006-09-19 23:42:06.000000000 -0400
>+++ linux-2.6.18.noarch/include/linux/snmp.h	2007-11-13 12:46:21.000000000 -0500
>@@ -108,6 +108,7 @@
> 	ICMP6_MIB_OUTPKTTOOBIGS,		/* OutPktTooBigs */
> 	ICMP6_MIB_OUTTIMEEXCDS,			/* OutTimeExcds */
> 	ICMP6_MIB_OUTPARMPROBLEMS,		/* OutParmProblems */
>+	ICMP6_MIB_OUTECHOS,			/* OutEchos */
> 	ICMP6_MIB_OUTECHOREPLIES,		/* OutEchoReplies */
> 	ICMP6_MIB_OUTROUTERSOLICITS,		/* OutRouterSolicits */
> 	ICMP6_MIB_OUTNEIGHBORSOLICITS,		/* OutNeighborSolicits */
>--- linux-2.6.18.noarch/net/ipv6/raw.c.orig	2007-11-13 12:41:34.000000000 -0500
>+++ linux-2.6.18.noarch/net/ipv6/raw.c	2007-11-15 12:24:49.000000000 -0500
>@@ -454,6 +454,9 @@
> 	int total_len;
> 	u32 tmp_csum;
> 	u16 csum;
>+	struct icmp6hdr *icmphdr;
>+	struct ipv6_pinfo *np = inet6_sk(sk);	
>+	struct rt6_info *rt = np->cork.rt;
> 
> 	if (!rp->checksum)
> 		goto send;
>@@ -516,6 +519,9 @@
> 	if (skb_store_bits(skb, offset, &csum, 2))
> 		BUG();
> 
>+	icmphdr = (struct icmp6hdr *)skb->h.raw;
>+	if (icmphdr->icmp6_type == ICMPV6_ECHO_REQUEST)
>+		ICMP6_INC_STATS(rt->rt6i_idev, ICMP6_MIB_OUTECHOS);	
> send:
> 	err = ip6_push_pending_frames(sk);
> out:
>@@ -559,6 +565,12 @@
> 	if (err)
> 		goto error_fault;
> 
>+	if (fl->proto == IPPROTO_ICMPV6) {
>+		struct icmp6hdr *icmphdr = (struct icmp6hdr *)(iph+1);
>+		if (icmphdr->icmp6_type == ICMPV6_ECHO_REQUEST)
>+			ICMP6_INC_STATS(rt->rt6i_idev, ICMP6_MIB_OUTECHOS);
>+	}
>+
> 	IP6_INC_STATS(IPSTATS_MIB_OUTREQUESTS);		
> 	err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
> 		      dst_output);
>--- linux-2.6.18.noarch/net/ipv6/proc.c.orig	2006-09-19 23:42:06.000000000 -0400
>+++ linux-2.6.18.noarch/net/ipv6/proc.c	2007-11-13 12:46:21.000000000 -0500
>@@ -115,6 +115,7 @@
> 	SNMP_MIB_ITEM("Icmp6OutPktTooBigs", ICMP6_MIB_OUTPKTTOOBIGS),
> 	SNMP_MIB_ITEM("Icmp6OutTimeExcds", ICMP6_MIB_OUTTIMEEXCDS),
> 	SNMP_MIB_ITEM("Icmp6OutParmProblems", ICMP6_MIB_OUTPARMPROBLEMS),
>+	SNMP_MIB_ITEM("Icmp6OutEchos", ICMP6_MIB_OUTECHOS),
> 	SNMP_MIB_ITEM("Icmp6OutEchoReplies", ICMP6_MIB_OUTECHOREPLIES),
> 	SNMP_MIB_ITEM("Icmp6OutRouterSolicits", ICMP6_MIB_OUTROUTERSOLICITS),
> 	SNMP_MIB_ITEM("Icmp6OutNeighborSolicits", ICMP6_MIB_OUTNEIGHBORSOLICITS),

Actions: View | Diff

Attachments on bug 287471: 260331