diff options
| author | Mikio Hara <mikioh.mikioh@gmail.com> | 2015-04-19 22:17:08 +0900 |
|---|---|---|
| committer | Mikio Hara <mikioh.mikioh@gmail.com> | 2015-04-21 04:16:14 +0000 |
| commit | 456cf0f22c93e1a6654980f4a48a564555f6c8a2 (patch) | |
| tree | 97bae5b777e64627aa33d05914759e95abbc6695 /src/net/interface_linux.go | |
| parent | 2173a27903897c481b0a0daf3ca3e0a0685701db (diff) | |
| download | go-456cf0f22c93e1a6654980f4a48a564555f6c8a2.tar.xz | |
net: fix inconsistent error values on Interface
This change fixes inconsistent error values on Interfaces,
InterfaceAddrs, InterfaceBy{Index,Name}, and Addrs and MulticastAddrs
methods of Interface.
Updates #4856.
Change-Id: I09e65522a22f45c641792d774ebf7a0081b874ad
Reviewed-on: https://go-review.googlesource.com/9140
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/net/interface_linux.go')
| -rw-r--r-- | src/net/interface_linux.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/net/interface_linux.go b/src/net/interface_linux.go index 84d57c3c93..3c117ea2f5 100644 --- a/src/net/interface_linux.go +++ b/src/net/interface_linux.go @@ -5,7 +5,6 @@ package net import ( - "os" "syscall" "unsafe" ) @@ -16,11 +15,11 @@ import ( func interfaceTable(ifindex int) ([]Interface, error) { tab, err := syscall.NetlinkRIB(syscall.RTM_GETLINK, syscall.AF_UNSPEC) if err != nil { - return nil, os.NewSyscallError("netlink rib", err) + return nil, err } msgs, err := syscall.ParseNetlinkMessage(tab) if err != nil { - return nil, os.NewSyscallError("netlink message", err) + return nil, err } var ift []Interface loop: @@ -33,7 +32,7 @@ loop: if ifindex == 0 || ifindex == int(ifim.Index) { attrs, err := syscall.ParseNetlinkRouteAttr(&m) if err != nil { - return nil, os.NewSyscallError("netlink routeattr", err) + return nil, err } ift = append(ift, *newLink(ifim, attrs)) if ifindex == int(ifim.Index) { @@ -120,11 +119,11 @@ func linkFlags(rawFlags uint32) Flags { func interfaceAddrTable(ifi *Interface) ([]Addr, error) { tab, err := syscall.NetlinkRIB(syscall.RTM_GETADDR, syscall.AF_UNSPEC) if err != nil { - return nil, os.NewSyscallError("netlink rib", err) + return nil, err } msgs, err := syscall.ParseNetlinkMessage(tab) if err != nil { - return nil, os.NewSyscallError("netlink message", err) + return nil, err } var ift []Interface if ifi == nil { @@ -160,7 +159,7 @@ loop: } attrs, err := syscall.ParseNetlinkRouteAttr(&m) if err != nil { - return nil, os.NewSyscallError("netlink routeattr", err) + return nil, err } ifa := newAddr(ifi, ifam, attrs) if ifa != nil { |