mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #630 from mrjana/bugs
Make ipamutils compile for windows
This commit is contained in:
commit
9d64e07700
3 changed files with 94 additions and 68 deletions
|
@ -1,14 +1,7 @@
|
||||||
// Package ipamutils provides utililty functions for ipam management
|
// Package ipamutils provides utililty functions for ipam management
|
||||||
package ipamutils
|
package ipamutils
|
||||||
|
|
||||||
import (
|
import "net"
|
||||||
"fmt"
|
|
||||||
"net"
|
|
||||||
|
|
||||||
"github.com/docker/libnetwork/netutils"
|
|
||||||
"github.com/docker/libnetwork/resolvconf"
|
|
||||||
"github.com/vishvananda/netlink"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
var (
|
||||||
// PredefinedBroadNetworks contains a list of 31 IPv4 private networks with host size 16 and 12
|
// PredefinedBroadNetworks contains a list of 31 IPv4 private networks with host size 16 and 12
|
||||||
|
@ -24,66 +17,6 @@ func init() {
|
||||||
PredefinedGranularNetworks = initGranularPredefinedNetworks()
|
PredefinedGranularNetworks = initGranularPredefinedNetworks()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ElectInterfaceAddresses looks for an interface on the OS with the specified name
|
|
||||||
// and returns its IPv4 and IPv6 addresses in CIDR form. If the interface does not exist,
|
|
||||||
// it chooses from a predifined list the first IPv4 address which does not conflict
|
|
||||||
// with other interfaces on the system.
|
|
||||||
func ElectInterfaceAddresses(name string) (*net.IPNet, []*net.IPNet, error) {
|
|
||||||
var (
|
|
||||||
v4Net *net.IPNet
|
|
||||||
v6Nets []*net.IPNet
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
|
|
||||||
link, _ := netlink.LinkByName(name)
|
|
||||||
if link != nil {
|
|
||||||
v4addr, err := netlink.AddrList(link, netlink.FAMILY_V4)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
v6addr, err := netlink.AddrList(link, netlink.FAMILY_V6)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
if len(v4addr) > 0 {
|
|
||||||
v4Net = v4addr[0].IPNet
|
|
||||||
}
|
|
||||||
for _, nlAddr := range v6addr {
|
|
||||||
v6Nets = append(v6Nets, nlAddr.IPNet)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if link == nil || v4Net == nil {
|
|
||||||
// Choose from predifined broad networks
|
|
||||||
v4Net, err = FindAvailableNetwork(PredefinedBroadNetworks)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return v4Net, v6Nets, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// FindAvailableNetwork returns a network from the passed list which does not
|
|
||||||
// overlap with existing interfaces in the system
|
|
||||||
func FindAvailableNetwork(list []*net.IPNet) (*net.IPNet, error) {
|
|
||||||
// We don't check for an error here, because we don't really care if we
|
|
||||||
// can't read /etc/resolv.conf. So instead we skip the append if resolvConf
|
|
||||||
// is nil. It either doesn't exist, or we can't read it for some reason.
|
|
||||||
var nameservers []string
|
|
||||||
if rc, err := resolvconf.Get(); err == nil {
|
|
||||||
nameservers = resolvconf.GetNameserversAsCIDR(rc.Content)
|
|
||||||
}
|
|
||||||
for _, nw := range list {
|
|
||||||
if err := netutils.CheckNameserverOverlaps(nameservers, nw); err == nil {
|
|
||||||
if err := netutils.CheckRouteOverlaps(nw); err == nil {
|
|
||||||
return nw, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil, fmt.Errorf("no available network")
|
|
||||||
}
|
|
||||||
|
|
||||||
func initBroadPredefinedNetworks() []*net.IPNet {
|
func initBroadPredefinedNetworks() []*net.IPNet {
|
||||||
pl := make([]*net.IPNet, 0, 31)
|
pl := make([]*net.IPNet, 0, 31)
|
||||||
mask := []byte{255, 255, 0, 0}
|
mask := []byte{255, 255, 0, 0}
|
||||||
|
|
71
libnetwork/ipamutils/utils_linux.go
Normal file
71
libnetwork/ipamutils/utils_linux.go
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
// Package ipamutils provides utililty functions for ipam management
|
||||||
|
package ipamutils
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
|
||||||
|
"github.com/docker/libnetwork/netutils"
|
||||||
|
"github.com/docker/libnetwork/resolvconf"
|
||||||
|
"github.com/vishvananda/netlink"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ElectInterfaceAddresses looks for an interface on the OS with the specified name
|
||||||
|
// and returns its IPv4 and IPv6 addresses in CIDR form. If the interface does not exist,
|
||||||
|
// it chooses from a predifined list the first IPv4 address which does not conflict
|
||||||
|
// with other interfaces on the system.
|
||||||
|
func ElectInterfaceAddresses(name string) (*net.IPNet, []*net.IPNet, error) {
|
||||||
|
var (
|
||||||
|
v4Net *net.IPNet
|
||||||
|
v6Nets []*net.IPNet
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
|
||||||
|
link, _ := netlink.LinkByName(name)
|
||||||
|
if link != nil {
|
||||||
|
v4addr, err := netlink.AddrList(link, netlink.FAMILY_V4)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
v6addr, err := netlink.AddrList(link, netlink.FAMILY_V6)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
if len(v4addr) > 0 {
|
||||||
|
v4Net = v4addr[0].IPNet
|
||||||
|
}
|
||||||
|
for _, nlAddr := range v6addr {
|
||||||
|
v6Nets = append(v6Nets, nlAddr.IPNet)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if link == nil || v4Net == nil {
|
||||||
|
// Choose from predifined broad networks
|
||||||
|
v4Net, err = FindAvailableNetwork(PredefinedBroadNetworks)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return v4Net, v6Nets, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// FindAvailableNetwork returns a network from the passed list which does not
|
||||||
|
// overlap with existing interfaces in the system
|
||||||
|
func FindAvailableNetwork(list []*net.IPNet) (*net.IPNet, error) {
|
||||||
|
// We don't check for an error here, because we don't really care if we
|
||||||
|
// can't read /etc/resolv.conf. So instead we skip the append if resolvConf
|
||||||
|
// is nil. It either doesn't exist, or we can't read it for some reason.
|
||||||
|
var nameservers []string
|
||||||
|
if rc, err := resolvconf.Get(); err == nil {
|
||||||
|
nameservers = resolvconf.GetNameserversAsCIDR(rc.Content)
|
||||||
|
}
|
||||||
|
for _, nw := range list {
|
||||||
|
if err := netutils.CheckNameserverOverlaps(nameservers, nw); err == nil {
|
||||||
|
if err := netutils.CheckRouteOverlaps(nw); err == nil {
|
||||||
|
return nw, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("no available network")
|
||||||
|
}
|
22
libnetwork/ipamutils/utils_windows.go
Normal file
22
libnetwork/ipamutils/utils_windows.go
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
// Package ipamutils provides utililty functions for ipam management
|
||||||
|
package ipamutils
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
|
||||||
|
"github.com/docker/libnetwork/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ElectInterfaceAddresses looks for an interface on the OS with the specified name
|
||||||
|
// and returns its IPv4 and IPv6 addresses in CIDR form. If the interface does not exist,
|
||||||
|
// it chooses from a predifined list the first IPv4 address which does not conflict
|
||||||
|
// with other interfaces on the system.
|
||||||
|
func ElectInterfaceAddresses(name string) (*net.IPNet, []*net.IPNet, error) {
|
||||||
|
return nil, nil, types.NotImplementedErrorf("not supported on windows")
|
||||||
|
}
|
||||||
|
|
||||||
|
// FindAvailableNetwork returns a network from the passed list which does not
|
||||||
|
// overlap with existing interfaces in the system
|
||||||
|
func FindAvailableNetwork(list []*net.IPNet) (*net.IPNet, error) {
|
||||||
|
return nil, types.NotImplementedErrorf("not supported on windows")
|
||||||
|
}
|
Loading…
Reference in a new issue