ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Incorporate with reviewer's comments

Browse Source
This commit is contained in:
Tomofumi Hayashi 2019-04-18 00:54:31 +09:00
parent 8c52f50849
commit 7924ef76da
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/main/macvlan/macvlan.go
View File

@ -51,20 +51,23 @@ func init() {
runtime.LockOSThread() runtime.LockOSThread()
} }
func getDefaultRouteInterfaceName() string { func getDefaultRouteInterfaceName() (string, error) {
routeToDstIP, err := netlink.RouteList(nil, netlink.FAMILY_ALL) routeToDstIP, err := netlink.RouteList(nil, netlink.FAMILY_ALL)
if err != nil { if err != nil {
return "" return "", err
} }
for _, v := range routeToDstIP { for _, v := range routeToDstIP {
l, _ := netlink.LinkByIndex(v.LinkIndex)
if v.Dst == nil { if v.Dst == nil {
return l.Attrs().Name l, err := netlink.LinkByIndex(v.LinkIndex)
if err != nil {
return "", err
}
return l.Attrs().Name, nil
} }
} }
return "" return "", fmt.Errorf("no default route interface found")
} }
func loadConf(bytes []byte) (*NetConf, string, error) { func loadConf(bytes []byte) (*NetConf, string, error) {
@ -73,9 +76,9 @@ func loadConf(bytes []byte) (*NetConf, string, error) {
return nil, "", fmt.Errorf("failed to load netconf: %v", err) return nil, "", fmt.Errorf("failed to load netconf: %v", err)
} }
if n.Master == "" { if n.Master == "" {
defaultRouteInterface := getDefaultRouteInterfaceName() defaultRouteInterface, err := getDefaultRouteInterfaceName()
if defaultRouteInterface == "" { if err != nil {
return nil, "", fmt.Errorf(`cannot get default route interface for master`) return nil, "", err
} }
n.Master = defaultRouteInterface n.Master = defaultRouteInterface
} }