qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 11:58:07 -07:00
Code Releases Activity

net: reference the correct RFCs and sections for IP.IsPrivate

Browse Source 
Properly cite RFC 1918 Section 3 for ipv4,
and RFC 4193 Section 8 for ipv6 comments.

Updates #29146

Change-Id: I8a2df0d7bef50444294bb3301fe09fb09f21ffaf
GitHub-Last-Rev: b0341791c0
GitHub-Pull-Request: golang/go#45500
Reviewed-on: https://go-review.googlesource.com/c/go/+/309249
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Emmanuel Odeke <emmanuel@orijtech.com>
This commit is contained in:
6543 2021-04-11 04:37:47 +00:00 committed by Emmanuel Odeke
parent 3f4977bd58
commit 189c6946f5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/ip.go
View File

@ -132,9 +132,9 @@ func (ip IP) IsLoopback() bool {
// RFC 1918 (IPv4 addresses) and RFC 4193 (IPv6 addresses). // RFC 1918 (IPv4 addresses) and RFC 4193 (IPv6 addresses).
func (ip IP) IsPrivate() bool { func (ip IP) IsPrivate() bool {
if ip4 := ip.To4(); ip4 != nil { if ip4 := ip.To4(); ip4 != nil {
// Following RFC 4193, Section 3. Local IPv6 Unicast Addresses which says: // Following RFC 1918, Section 3. Private Address Space which says:
// The Internet Assigned Numbers Authority (IANA) has reserved the // The Internet Assigned Numbers Authority (IANA) has reserved the
// following three blocks of the IPv4 address space for private internets: // following three blocks of the IP address space for private internets:
// 10.0.0.0 - 10.255.255.255 (10/8 prefix) // 10.0.0.0 - 10.255.255.255 (10/8 prefix)
// 172.16.0.0 - 172.31.255.255 (172.16/12 prefix) // 172.16.0.0 - 172.31.255.255 (172.16/12 prefix)
// 192.168.0.0 - 192.168.255.255 (192.168/16 prefix) // 192.168.0.0 - 192.168.255.255 (192.168/16 prefix)
@ -142,10 +142,8 @@ func (ip IP) IsPrivate() bool {
(ip4[0] == 172 && ip4[1]&0xf0 == 16) || (ip4[0] == 172 && ip4[1]&0xf0 == 16) ||
(ip4[0] == 192 && ip4[1] == 168) (ip4[0] == 192 && ip4[1] == 168)
} }
// Following RFC 4193, Section 3. Private Address Space which says: // Following RFC 4193, Section 8. IANA Considerations which says:
// The Internet Assigned Numbers Authority (IANA) has reserved the // The IANA has assigned the FC00::/7 prefix to "Unique Local Unicast".
// following block of the IPv6 address space for local internets:
// FC00:: - FDFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF (FC00::/7 prefix)
return len(ip) == IPv6len && ip[0]&0xfe == 0xfc return len(ip) == IPv6len && ip[0]&0xfe == 0xfc
} }