From patchwork Mon Dec 15 09:05:54 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 13998 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 353CCDDF03 for ; Mon, 15 Dec 2008 20:06:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752548AbYLOJG3 (ORCPT ); Mon, 15 Dec 2008 04:06:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752532AbYLOJG2 (ORCPT ); Mon, 15 Dec 2008 04:06:28 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:63013 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752521AbYLOJG1 (ORCPT ); Mon, 15 Dec 2008 04:06:27 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 3BD0617013E; Mon, 15 Dec 2008 17:07:48 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id mBF97l3D031143; Mon, 15 Dec 2008 17:07:47 +0800 Received: from localhost.localdomain (unknown [10.167.141.200]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 14209D432E; Mon, 15 Dec 2008 17:11:21 +0800 (CST) Message-ID: <49461DF2.8030502@cn.fujitsu.com> Date: Mon, 15 Dec 2008 17:05:54 +0800 From: Yang Hongyang User-Agent: Thunderbird 2.0.0.17 (X11/20081009) MIME-Version: 1.0 To: netdev@vger.kernel.org, "David S. Miller" Subject: Re: [RFC][PATCH 2/3]ipv6:fix the return interface index when get it while no message is received References: <493E19FC.1080609@cn.fujitsu.com> In-Reply-To: <493E19FC.1080609@cn.fujitsu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 > --- > 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 --- 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) {