ipv6: Add IPV6_PKTINFO sticky option support to setsockopt()

There are three reasons for me to add this support:
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.

2.When no IPV6_PKTINFO ancillary data is received,getsockopt() should
  return the sticky option value which set with setsockopt().

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:

3.Make the setsockopt implementation POSIX compliant.

Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 641e026eee8f1e3301a3297b85b0d6bafbcaadf5..0b816cae533eea35ece747f5c7921a3df8c979e3 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -278,6 +278,7 @@ struct ipv6_pinfo {
        struct in6_addr         saddr;
        struct in6_addr         rcv_saddr;
        struct in6_addr         daddr;
+       struct in6_pktinfo      sticky_pktinfo;
        struct in6_addr         *daddr_cache;
 #ifdef CONFIG_IPV6_SUBTREES
        struct in6_addr         *saddr_cache;

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 2aa294be0c790043bbc148a71ce030e4e5fbcc4c..0feaee38bc37ae40545efccae3a610cf4b246f62 100644 (file)
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -395,6 +395,28 @@ sticky_done:
                break;
        }
 
+       case IPV6_PKTINFO:
+       {
+               struct in6_pktinfo pkt;
+
+               if (optlen == 0)
+                       goto e_inval;
+               else if (optlen < sizeof(struct in6_pktinfo) || optval == NULL)
+                       goto e_inval;
+
+               if (copy_from_user(&pkt, optval, optlen)) {
+                               retv = -EFAULT;
+                               break;
+               }
+               if (sk->sk_bound_dev_if && pkt.ipi6_ifindex != sk->sk_bound_dev_if)
+                       goto e_inval;
+
+               np->sticky_pktinfo.ipi6_ifindex = pkt.ipi6_ifindex;
+               ipv6_addr_copy(&np->sticky_pktinfo.ipi6_addr, &pkt.ipi6_addr);
+               retv = 0;
+               break;
+       }
+
        case IPV6_2292PKTOPTIONS:
        {
                struct ipv6_txoptions *opt = NULL;