Patchwork [RFC,2/3] ipv6:fix the return interface index when get it while no message is received

login
register
mail settings
Submitter Yang Hongyang
Date Dec. 15, 2008, 9:05 a.m.
Message ID <49461DF2.8030502@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/13998/
State Accepted
Delegated to: David Miller
Headers show

Comments

Yang Hongyang - Dec. 15, 2008, 9:05 a.m.
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(-)
David Miller - Dec. 15, 2008, 11:19 p.m.
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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yang Hongyang - Dec. 16, 2008, 12:52 a.m.
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.^_^
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Dec. 16, 2008, 10:09 a.m.
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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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) {