luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Use net.IPv4zero to check for zero address

Browse source
This commit is contained in:
vishalnayak 2016-09-21 20:29:33 -04:00
parent aaadd4ad97
commit 07b1b244d6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
helper/cidrutil/cidr.go
View file

@ -130,7 +130,7 @@ func Subset(cidr1, cidr2 string) (bool, error) {
}
maskLen1, _ := net1.Mask.Size()
if ip1.To4().String() != "0.0.0.0" && maskLen1 == 0 {
if ip1.To4().Equal(net.IPv4zero) && maskLen1 == 0 {
return false, fmt.Errorf("CIDR to be checked against is not in its canonical form")
}
@ -140,7 +140,7 @@ func Subset(cidr1, cidr2 string) (bool, error) {
}
maskLen2, _ := net2.Mask.Size()
if ip2.To4().String() != "0.0.0.0" && maskLen2 == 0 {
if ip2.To4().Equal(net.IPv4zero) && maskLen2 == 0 {
return false, fmt.Errorf("CIDR that needs to be checked is not in its canonical form")
}