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/ipv4/icmp.c | |
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/ipv4/icmp.c')
-rw-r--r-- | net/ipv4/icmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 4b4c2bcd15db..d2aa7438c523 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -330,9 +330,10 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, | |||
330 | if (ip_append_data(sk, icmp_glue_bits, icmp_param, | 330 | if (ip_append_data(sk, icmp_glue_bits, icmp_param, |
331 | icmp_param->data_len+icmp_param->head_len, | 331 | icmp_param->data_len+icmp_param->head_len, |
332 | icmp_param->head_len, | 332 | icmp_param->head_len, |
333 | ipc, rt, MSG_DONTWAIT) < 0) | 333 | ipc, rt, MSG_DONTWAIT) < 0) { |
334 | ICMP_INC_STATS_BH(sock_net(sk), ICMP_MIB_OUTERRORS); | ||
334 | ip_flush_pending_frames(sk); | 335 | ip_flush_pending_frames(sk); |
335 | else if ((skb = skb_peek(&sk->sk_write_queue)) != NULL) { | 336 | } else if ((skb = skb_peek(&sk->sk_write_queue)) != NULL) { |
336 | struct icmphdr *icmph = icmp_hdr(skb); | 337 | struct icmphdr *icmph = icmp_hdr(skb); |
337 | __wsum csum = 0; | 338 | __wsum csum = 0; |
338 | struct sk_buff *skb1; | 339 | struct sk_buff *skb1; |