kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

netlink: make darwin happy

Browse source 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
This commit is contained in:
Johan Euphrosine 2014-01-17 16:30:27 -08:00
parent dadd54dba3
commit 77d9fd2628
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
network.go
View file

@ -73,7 +73,7 @@ func networkSize(mask net.IPMask) int32 {
func checkRouteOverlaps(networks []netlink.Route, dockerNetwork *net.IPNet) error { func checkRouteOverlaps(networks []netlink.Route, dockerNetwork *net.IPNet) error {
for _, network := range networks { for _, network := range networks {
if !network.Default && networkOverlaps(dockerNetwork, network.IPNet) { if network.IPNet != nil && networkOverlaps(dockerNetwork, network.IPNet) {
return fmt.Errorf("Network %s is already routed: '%s'", dockerNetwork, network) return fmt.Errorf("Network %s is already routed: '%s'", dockerNetwork, network)
} }
} }

2
pkg/netlink/netlink_darwin.go
View file

@ -5,7 +5,7 @@ import (
"net" "net"
) )
func NetworkGetRoutes() ([]*net.IPNet, error) { func NetworkGetRoutes() ([]Route, error) {
return nil, fmt.Errorf("Not implemented") return nil, fmt.Errorf("Not implemented")
} }