github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-14 18:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

make network calculation commutative

Browse Source
This commit is contained in:
Matthias Radestock
2017-08-10 11:08:42 +01:00
parent 1e16dd3cb2
commit 7db84aba21
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
report/networks.go
View File

@@ -114,15 +114,20 @@ func ContainingIPv4Network(ips []net.IP) *net.IPNet {
if len(ips) == 0 {
return nil
}
network := net.IPNet{
IP: ips[0],
Mask: net.CIDRMask(net.IPv4len*8, net.IPv4len*8),
}
cpl := net.IPv4len * 8
network := networkFromPrefix(ips[0], cpl)
for _, ip := range ips[1:] {
network.Mask = net.CIDRMask(commonIPv4PrefixLen(network.IP, ip), net.IPv4len*8)
network.IP = network.IP.Mask(network.Mask)
if ncpl := commonIPv4PrefixLen(network.IP, ip); ncpl < cpl {
cpl = ncpl
network = networkFromPrefix(network.IP, cpl)
}
}
return &network
return network
}
func networkFromPrefix(ip net.IP, prefixLen int) *net.IPNet {
mask := net.CIDRMask(prefixLen, net.IPv4len*8)
return &net.IPNet{IP: ip.Mask(mask), Mask: mask}
}
func commonIPv4PrefixLen(a, b net.IP) int {

1
report/networks_test.go
View File

@@ -29,6 +29,7 @@ func TestContainingIPv4Network(t *testing.T) {
assert.Nil(t, containingIPv4Networks([]string{}))
assert.Equal(t, "10.0.0.1/32", containingIPv4Networks([]string{"10.0.0.1"}).String())
assert.Equal(t, "10.0.0.0/17", containingIPv4Networks([]string{"10.0.0.1", "10.0.2.55", "10.0.106.48"}).String())
assert.Equal(t, "10.0.0.0/16", containingIPv4Networks([]string{"10.0.128.1", "10.0.0.1", "10.0.0.2"}).String())
assert.Equal(t, "0.0.0.0/0", containingIPv4Networks([]string{"10.0.0.1", "192.168.0.1"}).String())
}