* [RFC][PATCH 2/3]ipv6:fix the return interface index when get it while no message is received
@ 2008-12-09 7:10 Yang Hongyang
2008-12-15 9:05 ` Yang Hongyang
0 siblings, 1 reply; 5+ messages in thread
From: Yang Hongyang @ 2008-12-09 7:10 UTC (permalink / raw)
To: netdev, David S. Miller
When get receiving interface index while no message is received,
the the value seted with setsockopt() 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>
---
net/ipv6/ipv6_sockglue.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index fc80401..4770bd9 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -938,8 +938,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
} else {
if (np->rxopt.bits.rxinfo) {
struct in6_pktinfo src_info;
- src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if;
- ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr);
+ src_info.ipi6_ifindex = np->sticky_pktinfo.ipi6_ifindex;
+ ipv6_addr_copy(&src_info.ipi6_addr, &(np->sticky_pktinfo.ipi6_addr));
put_cmsg(&msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &src_info);
}
if (np->rxopt.bits.rxhlim) {
@@ -948,8 +948,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
}
if (np->rxopt.bits.rxoinfo) {
struct in6_pktinfo src_info;
- src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if;
- ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr);
+ src_info.ipi6_ifindex = np->sticky_pktinfo.ipi6_ifindex;
+ ipv6_addr_copy(&src_info.ipi6_addr, &(np->sticky_pktinfo.ipi6_addr));
put_cmsg(&msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &src_info);
}
if (np->rxopt.bits.rxohlim) {
--
1.6.0.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [RFC][PATCH 2/3]ipv6:fix the return interface index when get it while no message is received 2008-12-09 7:10 [RFC][PATCH 2/3]ipv6:fix the return interface index when get it while no message is received Yang Hongyang @ 2008-12-15 9:05 ` Yang Hongyang 2008-12-15 23:19 ` David Miller 2008-12-16 10:09 ` David Miller 0 siblings, 2 replies; 5+ messages in thread From: Yang Hongyang @ 2008-12-15 9:05 UTC (permalink / raw) To: netdev, David S. Miller Yang Hongyang wrote: > When get receiving interface index while no message is received, > the the value seted with setsockopt() 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> > --- > net/ipv6/ipv6_sockglue.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c > index fc80401..4770bd9 100644 > --- a/net/ipv6/ipv6_sockglue.c > +++ b/net/ipv6/ipv6_sockglue.c > @@ -938,8 +938,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, > } else { > if (np->rxopt.bits.rxinfo) { > struct in6_pktinfo src_info; > - src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if; > - ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr); > + src_info.ipi6_ifindex = np->sticky_pktinfo.ipi6_ifindex; > + ipv6_addr_copy(&src_info.ipi6_addr, &(np->sticky_pktinfo.ipi6_addr)); > put_cmsg(&msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &src_info); > } > if (np->rxopt.bits.rxhlim) { > @@ -948,8 +948,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, > } > if (np->rxopt.bits.rxoinfo) { > struct in6_pktinfo src_info; > - src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if; > - ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr); > + src_info.ipi6_ifindex = np->sticky_pktinfo.ipi6_ifindex; > + ipv6_addr_copy(&src_info.ipi6_addr, &(np->sticky_pktinfo.ipi6_addr)); > put_cmsg(&msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &src_info); > } > if (np->rxopt.bits.rxohlim) { Updated patch: When get receiving interface index while no message is received, the the value seted with setsockopt() 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> --- net/ipv6/ipv6_sockglue.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index fc80401..7ae3a2a 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -938,8 +938,10 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, } else { if (np->rxopt.bits.rxinfo) { struct in6_pktinfo src_info; - src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if; - ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr); + src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : + np->sticky_pktinfo.ipi6_ifindex; + np->mcast_oif? ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr) : + ipv6_addr_copy(&src_info.ipi6_addr, &(np->sticky_pktinfo.ipi6_addr)); put_cmsg(&msg, SOL_IPV6, IPV6_PKTINFO, sizeof(src_info), &src_info); } if (np->rxopt.bits.rxhlim) { @@ -948,8 +950,10 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, } if (np->rxopt.bits.rxoinfo) { struct in6_pktinfo src_info; - src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : sk->sk_bound_dev_if; - ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr); + src_info.ipi6_ifindex = np->mcast_oif ? np->mcast_oif : + np->sticky_pktinfo.ipi6_ifindex; + np->mcast_oif? ipv6_addr_copy(&src_info.ipi6_addr, &np->daddr) : + ipv6_addr_copy(&src_info.ipi6_addr, &(np->sticky_pktinfo.ipi6_addr)); put_cmsg(&msg, SOL_IPV6, IPV6_2292PKTINFO, sizeof(src_info), &src_info); } if (np->rxopt.bits.rxohlim) { -- 1.6.0.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RFC][PATCH 2/3]ipv6:fix the return interface index when get it while no message is received 2008-12-15 9:05 ` Yang Hongyang @ 2008-12-15 23:19 ` David Miller 2008-12-16 0:52 ` Yang Hongyang 2008-12-16 10:09 ` David Miller 1 sibling, 1 reply; 5+ messages in thread From: David Miller @ 2008-12-15 23:19 UTC (permalink / raw) To: yanghy; +Cc: netdev From: Yang Hongyang <yanghy@cn.fujitsu.com> Date: Mon, 15 Dec 2008 17:05:54 +0800 > Updated patch: Thanks Yang. I'm still reviewing this and deciding if I will apply the latest version of your patches. Thanks in advance for your patience. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RFC][PATCH 2/3]ipv6:fix the return interface index when get it while no message is received 2008-12-15 23:19 ` David Miller @ 2008-12-16 0:52 ` Yang Hongyang 0 siblings, 0 replies; 5+ messages in thread From: Yang Hongyang @ 2008-12-16 0:52 UTC (permalink / raw) To: David Miller; +Cc: netdev David Miller wrote: > From: Yang Hongyang <yanghy@cn.fujitsu.com> > Date: Mon, 15 Dec 2008 17:05:54 +0800 > >> Updated patch: > > Thanks Yang. I'm still reviewing this and deciding if I will > apply the latest version of your patches. > > Thanks in advance for your patience. > > Thanks Dave,I'm patiently waiting for your response.^_^ ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RFC][PATCH 2/3]ipv6:fix the return interface index when get it while no message is received 2008-12-15 9:05 ` Yang Hongyang 2008-12-15 23:19 ` David Miller @ 2008-12-16 10:09 ` David Miller 1 sibling, 0 replies; 5+ messages in thread From: David Miller @ 2008-12-16 10:09 UTC (permalink / raw) To: yanghy; +Cc: netdev From: Yang Hongyang <yanghy@cn.fujitsu.com> Date: Mon, 15 Dec 2008 17:05:54 +0800 > Updated patch: > > When get receiving interface index while no message is received, > the the value seted with setsockopt() should be returned. ... > Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> Applied. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-12-16 10:09 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-12-09 7:10 [RFC][PATCH 2/3]ipv6:fix the return interface index when get it while no message is received Yang Hongyang 2008-12-15 9:05 ` Yang Hongyang 2008-12-15 23:19 ` David Miller 2008-12-16 0:52 ` Yang Hongyang 2008-12-16 10:09 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).