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

Commit 3868b7aa authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set 



v4:
a) unchanged

Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 842df073

net/ipv6/datagram.c

+3 −1
Original line number Diff line number Diff line
@@ -594,7 +594,9 @@ int ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg, 
			sin6.sin6_addr = ipv6_hdr(skb)->daddr;

			sin6.sin6_port = ports[1];

			sin6.sin6_flowinfo = 0;

			sin6.sin6_scope_id = 0;

			sin6.sin6_scope_id =

				ipv6_iface_scope_id(&ipv6_hdr(skb)->daddr,

						    opt->iif);



			put_cmsg(msg, SOL_IPV6, IPV6_ORIGDSTADDR, sizeof(sin6), &sin6);

		}