ipv6: translate ICMP_TIME_EXCEEDED to ICMPV6_TIME_EXCEED

For better traceroute/mtr support for SIT and GRE tunnels,
we translate IPV4 ICMP ICMP_TIME_EXCEEDED to ICMPV6_TIME_EXCEED

We also have to translate the IPv4 source IP address of ICMP
message to IPv6 v4mapped.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index 9796481edbdb9a28a3de236f641ecf5417de6e57..97ae98071a03168b6c98c1e72acf7e6353715480 100644 (file)
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -18,7 +18,7 @@ typedef void ip6_icmp_send_t(struct sk_buff *skb, u8 type, u8 code, __u32 info,
                             const struct in6_addr *force_saddr);
 extern int inet6_register_icmp_sender(ip6_icmp_send_t *fn);
 extern int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn);
-int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs);
+int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type);
 
 #else
 

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 07bc63c23712a6d12d14cf0c2083dbe00886fc45..867aebc3424881aa1872be27902ccdc0f5cd320f 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -564,8 +564,9 @@ void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)
  *  Either an IPv4 header for SIT encap
  *         an IPv4 header + GRE header for GRE encap
  */
-int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs)
+int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type)
 {
+       struct in6_addr temp_saddr;
        struct rt6_info *rt;
        struct sk_buff *skb2;
 
@@ -586,8 +587,13 @@ int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs)
        if (rt && rt->dst.dev)
                skb2->dev = rt->dst.dev;
 
-       icmpv6_send(skb2, ICMPV6_DEST_UNREACH, ICMPV6_ADDR_UNREACH, 0);
-
+       ipv6_addr_set_v4mapped(ip_hdr(skb)->saddr, &temp_saddr);
+       if (type == ICMP_TIME_EXCEEDED)
+               icmp6_send(skb2, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,
+                          0, &temp_saddr);
+       else
+               icmp6_send(skb2, ICMPV6_DEST_UNREACH, ICMPV6_ADDR_UNREACH,
+                          0, &temp_saddr);
        if (rt)
                ip6_rt_put(rt);
 

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 78e84d6793eefaf039501b2795e14529367b6a0b..d7a36114eb50e66bd6f137a566ec2bc7ca93f382 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -535,11 +535,11 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
                goto out;
        }
 
-       if (t->parms.iph.daddr == 0)
+       err = 0;
+       if (!ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4, type))
                goto out;
 
-       err = 0;
-       if (!ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4))
+       if (t->parms.iph.daddr == 0)
                goto out;
 
        if (t->parms.iph.ttl == 0 && type == ICMP_TIME_EXCEEDED)