Skip to contentSkip to conversation

ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set

PATCH Applied Hannes Frederic Sowa 3 participants 3 messages Mar 8, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 4/4 ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set

v4:
a) unchanged

---
 net/ipv6/datagram.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv6/datagram.c +3 -1
index b55e70a..4b56cbb 100644
@@ -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
Acked-by on v4 4/4
#1 lore raw
Quoted 16 lines · Hannes Frederic Sowa

v4:
a) unchanged

---
 net/ipv6/datagram.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv6/datagram.c +0 -0
index b55e70a..4b56cbb 100644

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