| Message ID | 52D265D4.9050600@cn.fujitsu.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Duan Jiong <duanj.fnst@cn.fujitsu.com> Date: Sun, 12 Jan 2014 17:52:20 +0800 > Because after the icmp_send() is called, the icmpv4_xrlim_allow() > will be called to limit the icmp message too. > > Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> icmpv4_xrlim_allow() is different from what this code is doing. There are seperate controls for ip_error() reporting, namely: > - if (peer->rate_tokens > ip_rt_error_burst) ... > - if (peer->rate_tokens >= ip_rt_error_cost) And this is the only place where that is taken into account. The icmpv4_xrlim_allow() is a top level limiting on all ICMPs, this function is limiting specific kinds. I am not applying this patch, sorry. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index f8da282..e521de1 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -900,10 +900,7 @@ static int ip_error(struct sk_buff *skb) { struct in_device *in_dev = __in_dev_get_rcu(skb->dev); struct rtable *rt = skb_rtable(skb); - struct inet_peer *peer; - unsigned long now; struct net *net; - bool send; int code; net = dev_net(rt->dst.dev); @@ -936,23 +933,7 @@ static int ip_error(struct sk_buff *skb) break; } - peer = inet_getpeer_v4(net->ipv4.peers, ip_hdr(skb)->saddr, 1); - - send = true; - if (peer) { - now = jiffies; - peer->rate_tokens += now - peer->rate_last; - if (peer->rate_tokens > ip_rt_error_burst) - peer->rate_tokens = ip_rt_error_burst; - peer->rate_last = now; - if (peer->rate_tokens >= ip_rt_error_cost) - peer->rate_tokens -= ip_rt_error_cost; - else - send = false; - inet_putpeer(peer); - } - if (send) - icmp_send(skb, ICMP_DEST_UNREACH, code, 0); + icmp_send(skb, ICMP_DEST_UNREACH, code, 0); out: kfree_skb(skb); return 0;
Because after the icmp_send() is called, the icmpv4_xrlim_allow() will be called to limit the icmp message too. Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> --- net/ipv4/route.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)