raw: increment correct SNMP counters for ICMP messages
Subsystems (2)
PATCH v2 1/1 raw: increment correct SNMP counters for ICMP messages
Sending ICMP packets with raw sockets ends up in the SNMP counters logging the type as the first byte of the IPv4 header rather than the ICMP header. This is fixed by adding the IP Header Length to the casting into a icmphdr struct.
Signed-off-by Ben Cartwright-Cox <[email protected]>
Acked-by Eric Dumazet <[email protected]>
--- net/ipv4/raw.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/ipv4/raw.c +5 -3
@@ -406,10 +406,12 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,ip_select_ident (net, skb,NULL ); iph->check =ip_fast_csum ((unsigned char *)iph, iph->ihl); + skb->transport_header += iphlen; +if (iph->protocol ==IPPROTO_ICMP && + length >= iphlen +sizeof (struct icmphdr )) +icmp_out_count (net, ((struct icmphdr *) +skb_transport_header (skb))->type); } -if (iph->protocol ==IPPROTO_ICMP ) -icmp_out_count (net, ((struct icmphdr *) -skb_transport_header (skb))->type); err =NF_HOOK (NFPROTO_IPV4 ,NF_INET_LOCAL_OUT , sk, skb,NULL , rt->dst.dev, dst_output_sk);
Signature · 1 line
1.9.1
From: Ben Cartwright-Cox <[email protected]>
Date: Sat, 14 Nov 2015 15:13:58 +0000
Quoted 7 lines
Sending ICMP packets with raw sockets ends up in the SNMP counters logging the type as the first byte of the IPv4 header rather than the ICMP header. This is fixed by adding the IP Header Length to the casting into a icmphdr struct.
Signed-off-by Ben Cartwright-Cox <[email protected]>Acked-by Eric Dumazet <[email protected]>
Applied.