vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Improve get if socket loop

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-02-10 11:36:23 -08:00
parent e44920cbe6
commit 4b4a12a4c3
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
netlink/netlink_linux.go
View file

@ -10,6 +10,12 @@ import (
"unsafe" "unsafe"
) )
const (
IFNAMSIZ = 16
DEFAULT_CHANGE = 0xFFFFFFFF
IFLA_INFO_KIND = 1
)
var nextSeqNr int var nextSeqNr int
func nativeEndian() binary.ByteOrder { func nativeEndian() binary.ByteOrder {
@ -368,7 +374,7 @@ func NetworkSetMTU(iface *net.Interface, mtu int) error {
msg.Type = syscall.RTM_SETLINK msg.Type = syscall.RTM_SETLINK
msg.Flags = syscall.NLM_F_REQUEST msg.Flags = syscall.NLM_F_REQUEST
msg.Index = int32(iface.Index) msg.Index = int32(iface.Index)
msg.Change = 0xFFFFFFFF msg.Change = DEFAULT_CHANGE
wb.AddData(msg) wb.AddData(msg)
var ( var (
@ -400,7 +406,7 @@ func NetworkSetMaster(iface, master *net.Interface) error {
msg.Type = syscall.RTM_SETLINK msg.Type = syscall.RTM_SETLINK
msg.Flags = syscall.NLM_F_REQUEST msg.Flags = syscall.NLM_F_REQUEST
msg.Index = int32(iface.Index) msg.Index = int32(iface.Index)
msg.Change = 0xFFFFFFFF msg.Change = DEFAULT_CHANGE
wb.AddData(msg) wb.AddData(msg)
var ( var (
@ -432,7 +438,7 @@ func NetworkSetNsPid(iface *net.Interface, nspid int) error {
msg.Type = syscall.RTM_SETLINK msg.Type = syscall.RTM_SETLINK
msg.Flags = syscall.NLM_F_REQUEST msg.Flags = syscall.NLM_F_REQUEST
msg.Index = int32(iface.Index) msg.Index = int32(iface.Index)
msg.Change = 0xFFFFFFFF msg.Change = DEFAULT_CHANGE
wb.AddData(msg) wb.AddData(msg)
var ( var (
@ -524,8 +530,6 @@ func NetworkLinkAdd(name string, linkType string) error {
nameData := newRtAttr(syscall.IFLA_IFNAME, zeroTerminated(name)) nameData := newRtAttr(syscall.IFLA_IFNAME, zeroTerminated(name))
wb.AddData(nameData) wb.AddData(nameData)
IFLA_INFO_KIND := 1
kindData := newRtAttr(IFLA_INFO_KIND, nonZeroTerminated(linkType)) kindData := newRtAttr(IFLA_INFO_KIND, nonZeroTerminated(linkType))
infoData := newRtAttr(syscall.IFLA_LINKINFO, kindData.ToWireFormat()) infoData := newRtAttr(syscall.IFLA_LINKINFO, kindData.ToWireFormat())
@ -642,29 +646,22 @@ done:
return res, nil return res, nil
} }
func getIfSocket() (int, error) { func getIfSocket() (fd int, err error) {
fd, err := syscall.Socket(syscall.AF_INET, syscall.SOCK_DGRAM, 0) for _, socket := range []int{
if err == nil { syscall.AF_INET,
return fd, err syscall.AF_PACKET,
syscall.AF_INET6,
} {
if fd, err = syscall.Socket(socket, syscall.SOCK_DGRAM, 0); err == nil {
break
} }
sErr := err
fd, err = syscall.Socket(syscall.AF_PACKET, syscall.SOCK_DGRAM, 0)
if err == nil {
return fd, err
} }
fd, err = syscall.Socket(syscall.AF_INET6, syscall.SOCK_DGRAM, 0)
if err == nil { if err == nil {
return fd, err return fd, nil
} }
return -1, err
return -1, sErr
} }
// from <net/if.h>
const IFNAMSIZ = 16
func NetworkChangeName(oldName, newName string) error { func NetworkChangeName(oldName, newName string) error {
fd, err := getIfSocket() fd, err := getIfSocket()
if err != nil { if err != nil {