diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-03 18:09:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-03 18:09:04 -0400 |
commit | 1f8438a853667d48055ad38384c63e94b32c6578 (patch) | |
tree | d515b2246023abce5f151f35d70d270fa05b90c7 /net/ipv6 | |
parent | f66ef2d0649b220874532dfb83b6b5b368f83591 (diff) |
icmp: Account for ICMP out errors
When ip_append() fails because of socket limit or memory shortage,
increment ICMP_MIB_OUTERRORS counter, so that "netstat -s" can report
these errors.
LANG=C netstat -s | grep "ICMP messages failed"
0 ICMP messages failed
For IPV6, implement ICMP6_MIB_OUTERRORS counter as well.
# grep Icmp6OutErrors /proc/net/dev_snmp6/*
/proc/net/dev_snmp6/eth0:Icmp6OutErrors 0
/proc/net/dev_snmp6/lo:Icmp6OutErrors 0
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/icmp.c | 2 | ||||
-rw-r--r-- | net/ipv6/proc.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index eb9abe24bdf0..a00c18aa6c8d 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -482,6 +482,7 @@ route_done: | |||
482 | np->tclass, NULL, &fl, (struct rt6_info*)dst, | 482 | np->tclass, NULL, &fl, (struct rt6_info*)dst, |
483 | MSG_DONTWAIT); | 483 | MSG_DONTWAIT); |
484 | if (err) { | 484 | if (err) { |
485 | ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS); | ||
485 | ip6_flush_pending_frames(sk); | 486 | ip6_flush_pending_frames(sk); |
486 | goto out_put; | 487 | goto out_put; |
487 | } | 488 | } |
@@ -562,6 +563,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) | |||
562 | (struct rt6_info*)dst, MSG_DONTWAIT); | 563 | (struct rt6_info*)dst, MSG_DONTWAIT); |
563 | 564 | ||
564 | if (err) { | 565 | if (err) { |
566 | ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS); | ||
565 | ip6_flush_pending_frames(sk); | 567 | ip6_flush_pending_frames(sk); |
566 | goto out_put; | 568 | goto out_put; |
567 | } | 569 | } |
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 58344c0fbd13..458eabfbe130 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -97,6 +97,7 @@ static const struct snmp_mib snmp6_icmp6_list[] = { | |||
97 | SNMP_MIB_ITEM("Icmp6InMsgs", ICMP6_MIB_INMSGS), | 97 | SNMP_MIB_ITEM("Icmp6InMsgs", ICMP6_MIB_INMSGS), |
98 | SNMP_MIB_ITEM("Icmp6InErrors", ICMP6_MIB_INERRORS), | 98 | SNMP_MIB_ITEM("Icmp6InErrors", ICMP6_MIB_INERRORS), |
99 | SNMP_MIB_ITEM("Icmp6OutMsgs", ICMP6_MIB_OUTMSGS), | 99 | SNMP_MIB_ITEM("Icmp6OutMsgs", ICMP6_MIB_OUTMSGS), |
100 | SNMP_MIB_ITEM("Icmp6OutErrors", ICMP6_MIB_OUTERRORS), | ||
100 | SNMP_MIB_SENTINEL | 101 | SNMP_MIB_SENTINEL |
101 | }; | 102 | }; |
102 | 103 | ||