iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4: Pull icmp socket delivery out into a helper function.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-07-11 18:32:17 -07:00
parent 46d3ceabd8
commit 1de9243bbf
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/ipv4/icmp.c
View File

@ -634,18 +634,31 @@ out:;
EXPORT_SYMBOL(icmp_send); EXPORT_SYMBOL(icmp_send);
static void icmp_socket_deliver(struct sk_buff *skb, u32 info)
{
const struct iphdr *iph = (const struct iphdr *) skb->data;
const struct net_protocol *ipprot;
int protocol = iph->protocol;
raw_icmp_error(skb, protocol, info);
rcu_read_lock();
ipprot = rcu_dereference(inet_protos[protocol]);
if (ipprot && ipprot->err_handler)
ipprot->err_handler(skb, info);
rcu_read_unlock();
}
/* /*
* Handle ICMP_DEST_UNREACH, ICMP_TIME_EXCEED, and ICMP_QUENCH. * Handle ICMP_DEST_UNREACH, ICMP_TIME_EXCEED, and ICMP_QUENCH.
*/ */
static void icmp_unreach(struct sk_buff *skb) static void icmp_unreach(struct sk_buff *skb)
{ {
const struct net_protocol *ipprot;
const struct iphdr *iph; const struct iphdr *iph;
struct icmphdr *icmph; struct icmphdr *icmph;
struct net *net; struct net *net;
u32 info = 0; u32 info = 0;
int protocol;
net = dev_net(skb_dst(skb)->dev); net = dev_net(skb_dst(skb)->dev);
@ -726,19 +739,7 @@ static void icmp_unreach(struct sk_buff *skb)
if (!pskb_may_pull(skb, iph->ihl * 4 + 8)) if (!pskb_may_pull(skb, iph->ihl * 4 + 8))
goto out; goto out;
iph = (const struct iphdr *)skb->data; icmp_socket_deliver(skb, info);
protocol = iph->protocol;
/*
* Deliver ICMP message to raw sockets. Pretty useless feature?
*/
raw_icmp_error(skb, protocol, info);
rcu_read_lock();
ipprot = rcu_dereference(inet_protos[protocol]);
if (ipprot && ipprot->err_handler)
ipprot->err_handler(skb, info);
rcu_read_unlock();
out: out:
return; return;