mirror of
https://github.com/vishvananda/netlink
synced 2025-03-24 12:07:01 +00:00
support u32 link option
Signed-off-by: Zhiyuan Hou <zhiyuan2048@linux.alibaba.com>
This commit is contained in:
parent
ec93726159
commit
3bf47faadc
@ -36,6 +36,7 @@ type U32 struct {
|
||||
ClassId uint32
|
||||
Divisor uint32 // Divisor MUST be power of 2.
|
||||
Hash uint32
|
||||
Link uint32
|
||||
RedirIndex int
|
||||
Sel *TcU32Sel
|
||||
Actions []Action
|
||||
@ -225,6 +226,9 @@ func (h *Handle) filterModify(filter Filter, flags int) error {
|
||||
if filter.Hash != 0 {
|
||||
options.AddRtAttr(nl.TCA_U32_HASH, nl.Uint32Attr(filter.Hash))
|
||||
}
|
||||
if filter.Link != 0 {
|
||||
options.AddRtAttr(nl.TCA_U32_LINK, nl.Uint32Attr(filter.Link))
|
||||
}
|
||||
actionsAttr := options.AddRtAttr(nl.TCA_U32_ACT, nil)
|
||||
// backwards compatibility
|
||||
if filter.RedirIndex != 0 {
|
||||
@ -666,6 +670,8 @@ func parseU32Data(filter Filter, data []syscall.NetlinkRouteAttr) (bool, error)
|
||||
u32.Divisor = native.Uint32(datum.Value)
|
||||
case nl.TCA_U32_HASH:
|
||||
u32.Hash = native.Uint32(datum.Value)
|
||||
case nl.TCA_U32_LINK:
|
||||
u32.Link = native.Uint32(datum.Value)
|
||||
}
|
||||
}
|
||||
return detailed, nil
|
||||
|
142
filter_test.go
142
filter_test.go
@ -1310,3 +1310,145 @@ func TestFilterU32SkbEditAddDel(t *testing.T) {
|
||||
t.Fatal("Failed to remove qdisc")
|
||||
}
|
||||
}
|
||||
|
||||
func TestFilterU32LinkOption(t *testing.T) {
|
||||
tearDown := setUpNetlinkTest(t)
|
||||
defer tearDown()
|
||||
if err := LinkAdd(&Ifb{LinkAttrs{Name: "foo"}}); err != nil {
|
||||
t.Fatalf("add link foo error: %v", err)
|
||||
}
|
||||
link, err := LinkByName("foo")
|
||||
if err != nil {
|
||||
t.Fatalf("add link foo error: %v", err)
|
||||
}
|
||||
if err := LinkSetUp(link); err != nil {
|
||||
t.Fatalf("set foo link up error: %v", err)
|
||||
}
|
||||
|
||||
qdisc := &Ingress{
|
||||
QdiscAttrs: QdiscAttrs{
|
||||
LinkIndex: link.Attrs().Index,
|
||||
Handle: MakeHandle(0xffff, 0),
|
||||
Parent: HANDLE_INGRESS,
|
||||
},
|
||||
}
|
||||
if err := QdiscAdd(qdisc); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
qdiscs, err := SafeQdiscList(link)
|
||||
if err != nil {
|
||||
t.Fatalf("get qdisc error: %v", err)
|
||||
}
|
||||
|
||||
found := false
|
||||
for _, v := range qdiscs {
|
||||
if _, ok := v.(*Ingress); ok {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Fatal("Qdisc is the wrong type")
|
||||
}
|
||||
|
||||
htid := uint32(10)
|
||||
size := uint32(8)
|
||||
priority := uint16(200)
|
||||
u32Table := &U32{
|
||||
FilterAttrs: FilterAttrs{
|
||||
LinkIndex: link.Attrs().Index,
|
||||
Handle: htid << 20,
|
||||
Parent: MakeHandle(0xffff, 0),
|
||||
Priority: priority,
|
||||
Protocol: unix.ETH_P_ALL,
|
||||
},
|
||||
Divisor: size,
|
||||
}
|
||||
if err := FilterAdd(u32Table); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
u32 := &U32{
|
||||
FilterAttrs: FilterAttrs{
|
||||
LinkIndex: link.Attrs().Index,
|
||||
Parent: MakeHandle(0xffff, 0),
|
||||
Handle: 1,
|
||||
Priority: priority,
|
||||
Protocol: unix.ETH_P_ALL,
|
||||
},
|
||||
Link: uint32(htid << 20),
|
||||
Sel: &TcU32Sel{
|
||||
Nkeys: 1,
|
||||
Flags: TC_U32_TERMINAL | TC_U32_VAROFFSET,
|
||||
Hmask: 0x0000ff00,
|
||||
Hoff: 0,
|
||||
Offshift: 8,
|
||||
Keys: []TcU32Key{
|
||||
{
|
||||
Mask: 0,
|
||||
Val: 0,
|
||||
Off: 0,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
if err := FilterAdd(u32); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
filters, err := FilterList(link, MakeHandle(0xffff, 0))
|
||||
if err != nil {
|
||||
t.Fatalf("get filter error: %v", err)
|
||||
}
|
||||
|
||||
if len(filters) != 1 {
|
||||
t.Fatalf("the count filters error, expect: 1, acutal: %d", len(filters))
|
||||
}
|
||||
|
||||
ft, ok := filters[0].(*U32)
|
||||
if !ok {
|
||||
t.Fatal("Filter is the wrong type")
|
||||
}
|
||||
|
||||
if ft.LinkIndex != link.Attrs().Index {
|
||||
t.Fatal("link index error")
|
||||
}
|
||||
|
||||
if ft.Link != htid<<20 {
|
||||
t.Fatal("hash table id error")
|
||||
}
|
||||
|
||||
if ft.Priority != priority {
|
||||
t.Fatal("priority error")
|
||||
}
|
||||
|
||||
if err := FilterDel(ft); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
filters, err = FilterList(link, MakeHandle(0xffff, 0))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(filters) != 0 {
|
||||
t.Fatal("Failed to remove filter")
|
||||
}
|
||||
|
||||
if err := QdiscDel(qdisc); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
qdiscs, err = SafeQdiscList(link)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
found = false
|
||||
for _, v := range qdiscs {
|
||||
if _, ok := v.(*Ingress); ok {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if found {
|
||||
t.Fatal("Failed to remove qdisc")
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user