diff options
| author | Erik Kline <ek@google.com> | 2014-12-05 19:45:10 +0900 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-04-11 23:02:52 +0200 |
| commit | 77e4169c64f84f31bee4ca4600417c988c0e5b5e (patch) | |
| tree | b38df18ff76d5c4ea493593807a7a39706513a94 /net | |
| parent | 3c1c8130ab53347a16d1024fab35627e47acb4d7 (diff) | |
| download | kernel_samsung_tuna-77e4169c64f84f31bee4ca4600417c988c0e5b5e.zip kernel_samsung_tuna-77e4169c64f84f31bee4ca4600417c988c0e5b5e.tar.gz kernel_samsung_tuna-77e4169c64f84f31bee4ca4600417c988c0e5b5e.tar.bz2 | |
net: ipv6: allow choosing optimistic addresses with use_optimistic
The use_optimistic sysctl makes optimistic IPv6 addresses
equivalent to preferred addresses for source address selection
(e.g., when calling connect()), but it does not allow an
application to bind to optimistic addresses. This behaviour is
inconsistent - for example, it doesn't make sense for bind() to
an optimistic address fail with EADDRNOTAVAIL, but connect() to
choose that address outgoing address on the same socket.
Bug: 17769720
Bug: 18609055
Change-Id: I9de0d6c92ac45e29d28e318ac626c71806666f13
Signed-off-by: Erik Kline <ek@google.com>
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 1cb714f..8b6ab8e 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1319,7 +1319,9 @@ int ipv6_chk_addr(struct net *net, const struct in6_addr *addr, if (!net_eq(dev_net(ifp->idev->dev), net)) continue; if (ipv6_addr_equal(&ifp->addr, addr) && - !(ifp->flags&IFA_F_TENTATIVE) && + (!(ifp->flags&IFA_F_TENTATIVE) || + (ipv6_use_optimistic_addr(ifp->idev) && + ifp->flags&IFA_F_OPTIMISTIC)) && (dev == NULL || ifp->idev->dev == dev || !(ifp->scope&(IFA_LINK|IFA_HOST) || strict))) { rcu_read_unlock_bh(); |