Patchwork [RFC,3/3] ipv6:fix the outgoing interface selection order in udpv6_sendmsg()

login
register
mail settings
Submitter Yang Hongyang
Date Dec. 10, 2008, 9:41 a.m.
Message ID <493F8EBA.7070907@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/13145/
State Accepted
Delegated to: David Miller
Headers show

Comments

Yang Hongyang - Dec. 10, 2008, 9:41 a.m.
David Miller wrote:
> From: Yang Hongyang <yanghy@cn.fujitsu.com>
> Date: Wed, 10 Dec 2008 14:38:25 +0800
> 
...snip...
>>>>
>>> Hum..can we just ignore the sync of the sticky option and the SO_BINDTODEVICE,
>>> when send a message,first check sk_bound_dev_if,If it is specified,use it,otherwise
>>> use sticky option?This was what i ment. and in my patch ,the outgoing interface 
>>> specified by sticky options will be overrided by the interface specified by 
>>> SO_BINDTODEVICE.
>> If this is the solution, i'll post a updated patch.
> 
> Please do, this sounds like the correct approach.
> 

Thanks for your comment,here is the updated patch:

1.When no interface is specified in an IPV6_PKTINFO ancillary data
  item, the interface specified in an IPV6_PKTINFO sticky optionis 
  is used.

RFC3542:
6.7.  Summary of Outgoing Interface Selection

   This document and [RFC-3493] specify various methods that affect the
   selection of the packet's outgoing interface.  This subsection
   summarizes the ordering among those in order to ensure deterministic
   behavior.

   For a given outgoing packet on a given socket, the outgoing interface
   is determined in the following order:

   1. if an interface is specified in an IPV6_PKTINFO ancillary data
      item, the interface is used.

   2. otherwise, if an interface is specified in an IPV6_PKTINFO sticky
      option, the interface is used.

Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>

---
 net/ipv6/udp.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
David Miller - Dec. 16, 2008, 10:09 a.m.
From: Yang Hongyang <yanghy@cn.fujitsu.com>
Date: Wed, 10 Dec 2008 17:41:14 +0800

> Thanks for your comment,here is the updated patch:
 ...
> 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/udp.c b/net/ipv6/udp.c
index 8b48512..6b06421 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -763,6 +763,9 @@  do_udp_sendmsg:
 	if (!fl.oif)
 		fl.oif = sk->sk_bound_dev_if;
 
+	if (!fl.oif)
+		fl.oif = np->sticky_pktinfo.ipi6_ifindex;
+
 	if (msg->msg_controllen) {
 		opt = &opt_space;
 		memset(opt, 0, sizeof(struct ipv6_txoptions));