rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-04-27 03:00:49 +00:00
Code Issues Releases Wiki Activity

Update vishvananda/netlink to support set on /31 Interfaces

Browse Source
This commit is contained in:
niusmallnan 2019-11-27 08:23:09 +00:00 committed by niusmallnan
parent 4a2744e858
commit 615a6e4415
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trash.conf
View File

@ -29,7 +29,7 @@ github.com/sigma/vmw-ovflib master
github.com/sigma/bdoor master
github.com/stretchr/testify a1f97990ddc16022ec7610326dd9bce31332c116
github.com/vbatts/tar-split v0.9.11
github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93
github.com/vishvananda/netlink b76f71f1d33745ac0833fff4277481599a8ee73f https://github.com/niusmallnan/netlink
github.com/vishvananda/netns 54f0e4339ce73702a0607f49922aaa1e749b418d
github.com/xeipuuv/gojsonpointer 6fe8760cad3569743d51ddbb243b26f8456742dc
github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45

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

@ -103,14 +103,17 @@ func (h *Handle) addrHandle(link Link, addr *Addr, req *nl.NetlinkRequest) error
}
}
if addr.Broadcast == nil {
if addr.Broadcast == nil && prefixlen < 31 {
calcBroadcast := make(net.IP, masklen/8)
for i := range localAddrData {
calcBroadcast[i] = localAddrData[i] | ^addr.Mask[i]
}
addr.Broadcast = calcBroadcast
}
req.AddData(nl.NewRtAttr(syscall.IFA_BROADCAST, addr.Broadcast))
if addr.Broadcast != nil {
req.AddData(nl.NewRtAttr(syscall.IFA_BROADCAST, addr.Broadcast))
}
if addr.Label != "" {
labelData := nl.NewRtAttr(syscall.IFA_LABEL, nl.ZeroTerminated(addr.Label))