ipv6: Fix the return interface index when get it while no message is received.
When get receiving interface index while no message is received, the bounded device's index of the socket should be returned. RFC 3542: Issuing getsockopt() for the above options will return the sticky option value i.e., the value set with setsockopt(). If no sticky option value has been set getsockopt() will return the following values: - For the IPV6_PKTINFO option, it will return an in6_pktinfo structure with ipi6_addr being in6addr_any and ipi6_ifindex being zero. Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
4cf7cb280e
Коммит
13601cd8e4
|
@ -911,7 +911,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
|
||||||
} else {
|
} else {
|
||||||
if (np->rxopt.bits.rxinfo) {
|
if (np->rxopt.bits.rxinfo) {
|
||||||
struct in6_pktinfo src_info;
|
struct in6_pktinfo src_info;
|
||||||
src_info.ipi6_ifindex = np->mcast_oif;
|
src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if;
|
||||||
ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr);
|
ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr);
|
||||||
put_cmsg(&msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &src_info);
|
put_cmsg(&msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &src_info);
|
||||||
}
|
}
|
||||||
|
@ -921,7 +921,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
|
||||||
}
|
}
|
||||||
if (np->rxopt.bits.rxoinfo) {
|
if (np->rxopt.bits.rxoinfo) {
|
||||||
struct in6_pktinfo src_info;
|
struct in6_pktinfo src_info;
|
||||||
src_info.ipi6_ifindex = np->mcast_oif;
|
src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if;
|
||||||
ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr);
|
ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr);
|
||||||
put_cmsg(&msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &src_info);
|
put_cmsg(&msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &src_info);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче