Remove FlagsMask from Addr struct

This commit is contained in:
Hubert Krauze 2015-12-09 11:30:21 +01:00
parent 87df994490
commit f351153998
3 changed files with 5 additions and 7 deletions

View File

@ -13,7 +13,6 @@ type Addr struct {
Label string Label string
Flags int Flags int
Scope int Scope int
FlagsMask int
} }
// String returns $ip/$netmask $label // String returns $ip/$netmask $label

View File

@ -56,7 +56,7 @@ func addrHandle(link Link, addr *Addr, req *nl.NetlinkRequest) error {
addressData := nl.NewRtAttr(syscall.IFA_ADDRESS, addrData) addressData := nl.NewRtAttr(syscall.IFA_ADDRESS, addrData)
req.AddData(addressData) req.AddData(addressData)
if addr.FlagsMask != 0 { if addr.Flags != 0 {
b := make([]byte, 4) b := make([]byte, 4)
native.PutUint32(b, uint32(addr.Flags)) native.PutUint32(b, uint32(addr.Flags))
flagsData := nl.NewRtAttr(IFA_FLAGS, b) flagsData := nl.NewRtAttr(IFA_FLAGS, b)

View File

@ -107,7 +107,6 @@ func TestAddrAddDelFlags(t *testing.T) {
Mask: net.CIDRMask(24, 32), Mask: net.CIDRMask(24, 32),
}, },
Flags: syscall.IFA_F_PERMANENT, Flags: syscall.IFA_F_PERMANENT,
FlagsMask: syscall.IFA_F_PERMANENT,
} }
if err = AddrAdd(link, addr); err != nil { if err = AddrAdd(link, addr); err != nil {
t.Fatal(err) t.Fatal(err)