clearlinux/libnetwork
2
0
Fork 0
mirror of https://github.com/clearlinux/libnetwork.git synced 2026-05-13 18:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116 from mavenugo/master

Browse Source 
Incorrect assumption with golang net package causes Overlapping IP
This commit is contained in:
Jana Radhakrishnan
2015-05-04 22:42:05 -07:00
parent 5d28b9f14c 3678144103
commit fe87ce50bc
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bridge/setup_ipv4.go
View File

@@ -35,7 +35,7 @@ func init() {
log.Errorf("Failed to parse address %s", addr)
continue
}
net.IP = ip
net.IP = ip.To4()
bridgeNetworks = append(bridgeNetworks, net)
}
}

4
netutils/utils.go
View File

@@ -192,7 +192,9 @@ func CheckRouteOverlaps(toCheck *net.IPNet) error {
// NetworkOverlaps detects overlap between one IPNet and another
func NetworkOverlaps(netX *net.IPNet, netY *net.IPNet) bool {
if len(netX.IP) == len(netY.IP) {
// Check if both netX and netY are ipv4 or ipv6
if (netX.IP.To4() != nil && netY.IP.To4() != nil) ||
(netX.IP.To4() == nil && netY.IP.To4() == nil) {
if firstIP, _ := NetworkRange(netX); netY.Contains(firstIP) {
return true
}