Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1cadc1a authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv6: icmp: add a force_saddr param to icmp6_send() 



SIT or GRE tunnels might want to translate an IPV4 address
into a v4mapped one when translating ICMP to ICMPv6.

This patch adds the parameter to icmp6_send() but
does not change icmpv6_send() signature.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent adc01582

include/linux/icmpv6.h

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb) 
#if IS_ENABLED(CONFIG_IPV6)

extern void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info);



typedef void ip6_icmp_send_t(struct sk_buff *skb, u8 type, u8 code, __u32 info);

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);

net/ipv6/icmp.c

+5 −2
Original line number Diff line number Diff line
@@ -388,7 +388,8 @@ static struct dst_entry *icmpv6_route_lookup(struct net *net, 
/*

 *	Send an ICMP message in response to a packet in error

 */

static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)

static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,

		       const struct in6_addr *force_saddr)

{

	struct net *net = dev_net(skb->dev);

	struct inet6_dev *idev = NULL;
@@ -475,6 +476,8 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 
	memset(&fl6, 0, sizeof(fl6));

	fl6.flowi6_proto = IPPROTO_ICMPV6;

	fl6.daddr = hdr->saddr;

	if (force_saddr)

		saddr = force_saddr;

	if (saddr)

		fl6.saddr = *saddr;

	fl6.flowi6_mark = mark;
@@ -551,7 +554,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 
 */

void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)

{

	icmp6_send(skb, ICMPV6_PARAMPROB, code, pos);

	icmp6_send(skb, ICMPV6_PARAMPROB, code, pos, NULL);

	kfree_skb(skb);

}

net/ipv6/ip6_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 


	if (!send)

		goto out;

	send(skb, type, code, info);

	send(skb, type, code, info, NULL);

out:

	rcu_read_unlock();

}