luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #1050 from highlyunavailable/master

Browse source 
Add RFC 6598 private IP range
This commit is contained in:
Ryan Uber 2015-06-22 11:01:44 -07:00
parent d529329944 f1932e5e46
commit 713661a035
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
consul/util.go
View file

@ -19,6 +19,7 @@ import (
/* /*
* Contains an entry for each private block: * Contains an entry for each private block:
* 10.0.0.0/8 * 10.0.0.0/8
* 100.64.0.0/10
* 172.16.0.0/12 * 172.16.0.0/12
* 192.168/16 * 192.168/16
*/ */
@ -41,7 +42,8 @@ func (s *serverParts) String() string {
func init() { func init() {
// Add each private block // Add each private block
privateBlocks = make([]*net.IPNet, 3) privateBlocks = make([]*net.IPNet, 4)
_, block, err := net.ParseCIDR("10.0.0.0/8") _, block, err := net.ParseCIDR("10.0.0.0/8")
if err != nil { if err != nil {
panic(fmt.Sprintf("Bad cidr. Got %v", err)) panic(fmt.Sprintf("Bad cidr. Got %v", err))
@ -59,6 +61,12 @@ func init() {
panic(fmt.Sprintf("Bad cidr. Got %v", err)) panic(fmt.Sprintf("Bad cidr. Got %v", err))
} }
privateBlocks[2] = block privateBlocks[2] = block
_, block, err = net.ParseCIDR("100.64.0.0/10")
if err != nil {
panic(fmt.Sprintf("Bad cidr. Got %v", err))
}
privateBlocks[3] = block
} }
// strContains checks if a list contains a string // strContains checks if a list contains a string

3
consul/util_test.go
View file

@ -38,6 +38,9 @@ func TestIsPrivateIP(t *testing.T) {
if !isPrivateIP("10.1.2.3") { if !isPrivateIP("10.1.2.3") {
t.Fatalf("bad") t.Fatalf("bad")
} }
if !isPrivateIP("100.115.110.19") {
t.Fatalf("bad")
}
if isPrivateIP("8.8.8.8") { if isPrivateIP("8.8.8.8") {
t.Fatalf("bad") t.Fatalf("bad")
} }