[PATCH] net: Prefer non link-local source addresses
flat view
STALE5519d
From: Jeff Harris <hidden>
Date: 2011-09-01 20:27:21
Also in:
lkml
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
Section 2.6.1 of RFC 3927 specifies that if link-local and routable addresses are available on an interface, a routable address is preferred. Update the IPv4 source address selection algorithm to use a 169.254.x.x address only if another matching address is not found. Tested combinations of configured IP addresses with and without link-local to verify a link-local address was chosen only if no routable address was present. Signed-off-by: Jeff Harris <redacted> --- net/ipv4/devinet.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index bc19bd0..70ddf37 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c@@ -965,6 +965,8 @@ out: __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope) { __be32 addr = 0; + __be32 lladdr = 0; + __be32 firstaddr = 0; struct in_device *in_dev; struct net *net = dev_net(dev);
@@ -977,15 +979,27 @@ __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope) if (ifa->ifa_scope > scope) continue; if (!dst || inet_ifa_match(dst, ifa)) { + if (ipv4_is_linklocal_169(ifa->ifa_address)) { + lladdr = ifa->ifa_local; + continue; + } addr = ifa->ifa_local; break; } - if (!addr) - addr = ifa->ifa_local; + if (!firstaddr) + firstaddr = ifa->ifa_local; } endfor_ifa(in_dev); if (addr) goto out_unlock; + if (lladdr) { + addr = lladdr; + goto out_unlock; + } + if (firstaddr) { + addr = firstaddr; + goto out_unlock; + } no_in_dev: /* Not loopback addresses on loopback should be preferred
--
1.7.0.5