| From stable-bounces@linux.kernel.org Thu Jun 22 01:39:43 2006 |
| Date: Thu, 22 Jun 2006 01:39:05 -0700 (PDT) |
| From: David Miller <davem@davemloft.net> |
| To: stable@kernel.org |
| Cc: |
| Subject: IPV6: Fix source address selection. |
| |
| From: $,1 aukasz Stelmach <stlman@poczta.fm> |
| |
| Two additional labels (RFC 3484, sec. 10.3) for IPv6 addreses |
| are defined to make a distinction between global unicast |
| addresses and Unique Local Addresses (fc00::/7, RFC 4193) and |
| Teredo (2001::/32, RFC 4380). It is necessary to avoid attempts |
| of connection that would either fail (eg. fec0:: to 2001:feed::) |
| or be sub-optimal (2001:0:: to 2001:feed::). |
| |
| Signed-off-by: $,1 aukasz Stelmach <stlman@poczta.fm> |
| Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/ipv6/addrconf.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| --- linux-2.6.16.22.orig/net/ipv6/addrconf.c |
| +++ linux-2.6.16.22/net/ipv6/addrconf.c |
| @@ -852,6 +852,8 @@ static int inline ipv6_saddr_label(const |
| * 2002::/16 2 |
| * ::/96 3 |
| * ::ffff:0:0/96 4 |
| + * fc00::/7 5 |
| + * 2001::/32 6 |
| */ |
| if (type & IPV6_ADDR_LOOPBACK) |
| return 0; |
| @@ -859,8 +861,12 @@ static int inline ipv6_saddr_label(const |
| return 3; |
| else if (type & IPV6_ADDR_MAPPED) |
| return 4; |
| + else if (addr->s6_addr32[0] == htonl(0x20010000)) |
| + return 6; |
| else if (addr->s6_addr16[0] == htons(0x2002)) |
| return 2; |
| + else if ((addr->s6_addr[0] & 0xfe) == 0xfc) |
| + return 5; |
| return 1; |
| } |
| |
