Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/netutil: use native byte ordering for route information

Browse Source 
Fixes #7199
This commit is contained in:
Anthony Romano 2017-01-20 01:44:18 -08:00
parent e446c2c2c7
commit 1ada4f939f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/netutil/routes.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// +build !linux !386,!amd64 // +build !linux
package netutil package netutil

11
pkg/netutil/routes_linux.go
View File

@ -13,9 +13,6 @@
// limitations under the License. // limitations under the License.
// +build linux // +build linux
// +build 386 amd64
// TODO support native endian but without using "unsafe"
package netutil package netutil
@ -25,6 +22,8 @@ import (
"fmt" "fmt"
"net" "net"
"syscall" "syscall"
"github.com/coreos/etcd/pkg/cpuutil"
) )
var errNoDefaultRoute = fmt.Errorf("could not find default route") var errNoDefaultRoute = fmt.Errorf("could not find default route")
@ -80,7 +79,7 @@ func getDefaultRoute() (*syscall.NetlinkMessage, error) {
continue continue
} }
buf := bytes.NewBuffer(m.Data[:syscall.SizeofRtMsg]) buf := bytes.NewBuffer(m.Data[:syscall.SizeofRtMsg])
if rerr := binary.Read(buf, binary.LittleEndian, &rtmsg); rerr != nil { if rerr := binary.Read(buf, cpuutil.ByteOrder(), &rtmsg); rerr != nil {
continue continue
} }
if rtmsg.Dst_len == 0 { if rtmsg.Dst_len == 0 {
@ -109,7 +108,7 @@ func getIface(idx uint32) (*syscall.NetlinkMessage, error) {
continue continue
} }
buf := bytes.NewBuffer(m.Data[:syscall.SizeofIfAddrmsg]) buf := bytes.NewBuffer(m.Data[:syscall.SizeofIfAddrmsg])
if rerr := binary.Read(buf, binary.LittleEndian, &ifaddrmsg); rerr != nil { if rerr := binary.Read(buf, cpuutil.ByteOrder(), &ifaddrmsg); rerr != nil {
continue continue
} }
if ifaddrmsg.Index == idx { if ifaddrmsg.Index == idx {
@ -164,7 +163,7 @@ func parsePREFSRC(m *syscall.NetlinkMessage) (host string, oif uint32, err error
host = net.IP(attr.Value).String() host = net.IP(attr.Value).String()
} }
if attr.Attr.Type == syscall.RTA_OIF { if attr.Attr.Type == syscall.RTA_OIF {
oif = binary.LittleEndian.Uint32(attr.Value) oif = cpuutil.ByteOrder().Uint32(attr.Value)
} }
if host != "" && oif != uint32(0) { if host != "" && oif != uint32(0) {
break break