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 1a04d9abba
commit c317888ac5
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ip/link.go
View File

@ -153,18 +153,29 @@ func DelLinkByNameAddr(ifName string, family int) (*net.IPNet, error) {
return addrs[0].IPNet, nil return addrs[0].IPNet, nil
} }
func SetHWAddrByIP(link netlink.Link, ip4 net.IP, ip6 net.IP) error { func SetHWAddrByIP(ifName string, ip4 net.IP, ip6 net.IP) error {
if ip4 != nil { iface, err := netlink.LinkByName(ifName)
hwAddr, err := hwaddr.GenerateHardwareAddr4(ip4, hwaddr.PrivateMACPrefix) if err != nil {
if err != nil { return fmt.Errorf("failed to lookup %q: %v", ifName, err)
return fmt.Errorf("failed to generate hardware addr: %v", err)
}
if err = netlink.LinkSetHardwareAddr(link, hwAddr); err != nil {
return fmt.Errorf("failed to add hardware addr to %q: %v", link.Attrs().Name, err)
}
} }
// TODO: IPv6 switch {
case ip4 == nil && ip6 == nil:
return fmt.Errorf("neither ip4 or ip6 specified")
case ip4 != nil:
{
hwAddr, err := hwaddr.GenerateHardwareAddr4(ip4, hwaddr.PrivateMACPrefix)
if err != nil {
return fmt.Errorf("failed to generate hardware addr: %v", err)
}
if err = netlink.LinkSetHardwareAddr(iface, hwAddr); err != nil {
return fmt.Errorf("failed to add hardware addr to %q: %v", ifName, err)
}
}
case ip6 != nil:
// TODO: IPv6
}
return nil return nil
} }