aboutsummaryrefslogtreecommitdiff
path: root/src/net/interface_linux.go
diff options
context:
space:
mode:
authorRick Hudson <rlh@golang.org>2016-04-27 18:19:16 -0400
committerRick Hudson <rlh@golang.org>2016-04-27 18:46:52 -0400
commit23aeb34df172b17b7bfaa85fb59ca64bef9073bb (patch)
treea8ab866f1e50f0059856ce628f036d93ab620155 /src/net/interface_linux.go
parent1354b32cd70f2702381764fd595dd2faa996840c (diff)
parentd3c79d324acd7300b6f705e66af8ca711af00d9f (diff)
downloadgo-23aeb34df172b17b7bfaa85fb59ca64bef9073bb.tar.xz
[dev.garbage] Merge remote-tracking branch 'origin/master' into HEAD
Change-Id: I282fd9ce9db435dfd35e882a9502ab1abc185297
Diffstat (limited to 'src/net/interface_linux.go')
-rw-r--r--src/net/interface_linux.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net/interface_linux.go b/src/net/interface_linux.go
index 5e391b28b0..b8f57fd7db 100644
--- a/src/net/interface_linux.go
+++ b/src/net/interface_linux.go
@@ -193,6 +193,9 @@ func newAddr(ifi *Interface, ifam *syscall.IfAddrmsg, attrs []syscall.NetlinkRou
case syscall.AF_INET6:
ifa := &IPNet{IP: make(IP, IPv6len), Mask: CIDRMask(int(ifam.Prefixlen), 8*IPv6len)}
copy(ifa.IP, a.Value[:])
+ if ifa.IP.IsLinkLocalUnicast() {
+ ifa.Zone = ifi.Name
+ }
return ifa
}
}