ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set
Subsystems (2)
PATCH v4 4/4 ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set
v4:
a) unchanged
Cc YOSHIFUJI Hideaki <[email protected]>
Signed-off-by Hannes Frederic Sowa <[email protected]>
--- net/ipv6/datagram.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv6/datagram.c +3 -1
@@ -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); }
Signature · 1 line
1.8.1.4
Quoted 16 lines · Hannes Frederic Sowa
v4:
a) unchangedCc YOSHIFUJI Hideaki <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>--- net/ipv6/datagram.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)net/ipv6/datagram.c +0
-0
net/ipv6/datagram.c int ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg, · line 602
Quoted 10 lines
net/ipv6/datagram.c +3
-1@@ -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); }
From: YOSHIFUJI Hideaki <[email protected]>
Date: Sat, 09 Mar 2013 01:30:42 +0900
Quoted 7 lines
Quoted 6 lines · Hannes Frederic Sowa
v4:
a) unchangedCc YOSHIFUJI Hideaki <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>
...
Quoted 1 line
Applied.