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

pkg/ip: use iface name in SetHWAddrByIP

Browse Source
This commit is contained in:
Stefan Junker
2016-06-29 12:13:05 -07:00
parent 8e1c215116
commit 7d19c01818
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/main/bridge/bridge.go
View File

@ -251,11 +251,7 @@ func cmdAdd(args *skel.CmdArgs) error {
return err
}
contVethLink, err := netlink.LinkByName(args.IfName)
if err != nil {
return fmt.Errorf("failed to lookup %q: %v", args.IfName, err)
}
if err := ip.SetHWAddrByIP(contVethLink, result.IP4.IP.IP, nil /* TODO IPv6 */); err != nil {
if err := ip.SetHWAddrByIP(args.IfName, result.IP4.IP.IP, nil /* TODO IPv6 */); err != nil {
return err
}
@ -274,7 +270,7 @@ func cmdAdd(args *skel.CmdArgs) error {
return err
}
if err := ip.SetHWAddrByIP(br, gwn.IP, nil /* TODO IPv6 */); err != nil {
if err := ip.SetHWAddrByIP(n.BrName, gwn.IP, nil /* TODO IPv6 */); err != nil {
return err
}

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

@ -149,11 +149,7 @@ func cmdAdd(args *skel.CmdArgs) error {
}
err = netns.Do(func(_ ns.NetNS) error {
contVethLink, err := netlink.LinkByName(args.IfName)
if err != nil {
return fmt.Errorf("failed to lookup %q: %v", args.IfName, err)
}
if err := ip.SetHWAddrByIP(contVethLink, result.IP4.IP.IP, nil /* TODO IPv6 */); err != nil {
if err := ip.SetHWAddrByIP(args.IfName, result.IP4.IP.IP, nil /* TODO IPv6 */); err != nil {
return err
}

8
plugins/main/ptp/ptp.go
View File

@ -64,7 +64,9 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
return err
}
if err := ip.SetHWAddrByIP(hostVeth, pr.IP4.IP.IP, nil /* TODO IPv6 */); err != nil {
hostVethName = hostVeth.Attrs().Name
if err := ip.SetHWAddrByIP(hostVethName, pr.IP4.IP.IP, nil /* TODO IPv6 */); err != nil {
return fmt.Errorf("failed to set hardware addr by IP: %v", err)
}
@ -77,7 +79,7 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
return fmt.Errorf("failed to look up %q: %v", ifName, err)
}
if err := ip.SetHWAddrByIP(contVeth, pr.IP4.IP.IP, nil /* TODO IPv6 */); err != nil {
if err := ip.SetHWAddrByIP(contVeth.Attrs().Name, pr.IP4.IP.IP, nil /* TODO IPv6 */); err != nil {
return fmt.Errorf("failed to set hardware addr by IP: %v", err)
}
@ -121,8 +123,6 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
}
}
hostVethName = hostVeth.Attrs().Name
return nil
})
return hostVethName, err