github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update vishvananda/netlink and add vishvananda/netns

Browse Source 
This commit changes vishvananda/netlink binds godep version to:
  49a735373919c4c9a53aff1f9f63da73a243f32d
And adds vishvananda/netns with version:
  8ba1072b58e0c2a240eb5f6120165c7776c3e7b8
This commit is contained in:
Dmitry Shulyak
2016-08-14 14:42:32 +03:00
parent 573ad7ac61
commit c6eb9e07bb
44 changed files with 5447 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vendor/github.com/vishvananda/netlink/netlink.go generated vendored
View File

@@ -8,18 +8,7 @@
// interface that is loosly modeled on the iproute2 cli.
package netlink
import (
"net"
"github.com/vishvananda/netlink/nl"
)
const (
// Family type definitions
FAMILY_ALL = nl.FAMILY_ALL
FAMILY_V4 = nl.FAMILY_V4
FAMILY_V6 = nl.FAMILY_V6
)
import "net"
// ParseIPNet parses a string in ip/net format and returns a net.IPNet.
// This is valuable because addresses in netlink are often IPNets and
@@ -33,7 +22,10 @@ func ParseIPNet(s string) (*net.IPNet, error) {
return &net.IPNet{IP: ip, Mask: ipNet.Mask}, nil
}
// NewIPNet generates an IPNet from an ip address using a netmask of 32.
// NewIPNet generates an IPNet from an ip address using a netmask of 32 or 128.
func NewIPNet(ip net.IP) *net.IPNet {
return &net.IPNet{IP: ip, Mask: net.CIDRMask(32, 32)}
if ip.To4() != nil {
return &net.IPNet{IP: ip, Mask: net.CIDRMask(32, 32)}
}
return &net.IPNet{IP: ip, Mask: net.CIDRMask(128, 128)}
}