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

Merge pull request #445 from mars1024/bugfix/link_del

Browse Source 
pkg/ip: use type cast instead of untrusty error message
This commit is contained in:
Dan Williams
2020-01-29 10:20:32 -06:00
committed by GitHub
parent 832f2699c2 2ff84a481e
commit 66e0aaf9c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/ip/link_linux.go
View File

@ -178,7 +178,7 @@ func SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (net.Interface, ne
func DelLinkByName(ifName string) error { func DelLinkByName(ifName string) error {
iface, err := netlink.LinkByName(ifName) iface, err := netlink.LinkByName(ifName)
if err != nil { if err != nil {
if err.Error() == "Link not found" { if _, ok := err.(netlink.LinkNotFoundError); ok {
return ErrLinkNotFound return ErrLinkNotFound
} }
return fmt.Errorf("failed to lookup %q: %v", ifName, err) return fmt.Errorf("failed to lookup %q: %v", ifName, err)
@ -195,7 +195,7 @@ func DelLinkByName(ifName string) error {
func DelLinkByNameAddr(ifName string) ([]*net.IPNet, error) { func DelLinkByNameAddr(ifName string) ([]*net.IPNet, error) {
iface, err := netlink.LinkByName(ifName) iface, err := netlink.LinkByName(ifName)
if err != nil { if err != nil {
if err != nil && err.Error() == "Link not found" { if _, ok := err.(netlink.LinkNotFoundError); ok {
return nil, ErrLinkNotFound return nil, ErrLinkNotFound
} }
return nil, fmt.Errorf("failed to lookup %q: %v", ifName, err) return nil, fmt.Errorf("failed to lookup %q: %v", ifName, err)