Commit 9f690db7 authored Dec 16, 2008 by Yang Hongyang Committed by David S. Miller Dec 16, 2008

ipv6: fix the outgoing interface selection order in udpv6_sendmsg()



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>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f250dcda

net/ipv6/udp.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -793,6 +793,9 @@ int udpv6_sendmsg(struct kiocb iocb, struct sock sk,
		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));