[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <5239E027.9080507@gmail.com>
Date: Thu, 19 Sep 2013 01:17:27 +0800
From: Duan Jiong <djduanjiong@...il.com>
To: Duan Jiong <duanj.fnst@...fujitsu.com>,
David Miller <davem@...emloft.net>
CC: netdev@...r.kernel.org, hannes@...essinduktion.org
Subject: Re: [PATCH ] ip6tnl: do route updating for redirect in ip6_tnl_err()
δΊ 2013/9/18 20:05, Duan Jiong ει:
> From: Duan Jiong <duanj.fnst@...fujitsu.com>
>
> After the ip6_tnl_err() is called, the rel_msg is assigned
> to 0, and the ip4ip6_err()will return directly, the instruction
> below will not be executed.
>
> In rfc2473, we can know that the tunnel ICMP redirect
> message should not be reported to the source of the
> original packet, so we can handle it in ip4ip6_err().
>
> Signed-off-by: Duan Jiong <duanj.fnst@...fujitsu.com>
> ---
> net/ipv6/ip6_tunnel.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
> index 2d8f482..35c4b70 100644
> --- a/net/ipv6/ip6_tunnel.c
> +++ b/net/ipv6/ip6_tunnel.c
> @@ -529,6 +529,9 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,
> rel_msg = 1;
> }
> break;
> + case NDISC_REDIRECT:
> + ip6_redirect(skb, net, 0, 0);
sorry, it should be
ip6_redirect(skb, dev_net(skb->dev), skb->dev->ifindex, 0);
> + break;
> }
>
> *type = rel_type;
> @@ -576,9 +579,6 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
> rel_type = ICMP_DEST_UNREACH;
> rel_code = ICMP_FRAG_NEEDED;
> break;
> - case NDISC_REDIRECT:
> - rel_type = ICMP_REDIRECT;
> - rel_code = ICMP_REDIR_HOST;
> default:
> return 0;
> }
> @@ -637,8 +637,6 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
>
> skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), NULL, skb2, rel_info);
> }
> - if (rel_type == ICMP_REDIRECT)
> - skb_dst(skb2)->ops->redirect(skb_dst(skb2), NULL, skb2);
>
> icmp_send(skb2, rel_type, rel_code, htonl(rel_info));
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists