RepoMirrors
/
netlink
mirror of https://github.com/vishvananda/netlink
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support dst_port and src_port attributes in flower filter

This commit is contained in:
Ivan Kolodyazhny 2022-08-31 22:14:03 +03:00 committed by Alessandro Boch
parent 130828cd57
commit 70ca0345ee
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
filter_linux.go
View File

@ -67,6 +67,8 @@ type Flower struct {
SkipHw bool SkipHw bool
SkipSw bool SkipSw bool
IPProto *nl.IPProto IPProto *nl.IPProto
DestPort uint16
SrcPort uint16
Actions []Action Actions []Action
} }
@ -135,6 +137,26 @@ func (filter *Flower) encode(parent *nl.RtAttr) error {
if filter.IPProto != nil { if filter.IPProto != nil {
ipproto := *filter.IPProto ipproto := *filter.IPProto
parent.AddRtAttr(nl.TCA_FLOWER_KEY_IP_PROTO, ipproto.Serialize()) parent.AddRtAttr(nl.TCA_FLOWER_KEY_IP_PROTO, ipproto.Serialize())
if filter.SrcPort != 0 {
switch ipproto {
case nl.IPPROTO_TCP:
parent.AddRtAttr(nl.TCA_FLOWER_KEY_TCP_SRC, htons(filter.SrcPort))
case nl.IPPROTO_UDP:
parent.AddRtAttr(nl.TCA_FLOWER_KEY_UDP_SRC, htons(filter.SrcPort))
case nl.IPPROTO_SCTP:
parent.AddRtAttr(nl.TCA_FLOWER_KEY_SCTP_SRC, htons(filter.SrcPort))
}
}
if filter.DestPort != 0 {
switch ipproto {
case nl.IPPROTO_TCP:
parent.AddRtAttr(nl.TCA_FLOWER_KEY_TCP_DST, htons(filter.DestPort))
case nl.IPPROTO_UDP:
parent.AddRtAttr(nl.TCA_FLOWER_KEY_UDP_DST, htons(filter.DestPort))
case nl.IPPROTO_SCTP:
parent.AddRtAttr(nl.TCA_FLOWER_KEY_SCTP_DST, htons(filter.DestPort))
}
}
} }
var flags uint32 = 0 var flags uint32 = 0
@ -182,6 +204,10 @@ func (filter *Flower) decode(data []syscall.NetlinkRouteAttr) error {
val := new(nl.IPProto) val := new(nl.IPProto)
*val = nl.IPProto(datum.Value[0]) *val = nl.IPProto(datum.Value[0])
filter.IPProto = val filter.IPProto = val
case nl.TCA_FLOWER_KEY_TCP_SRC, nl.TCA_FLOWER_KEY_UDP_SRC, nl.TCA_FLOWER_KEY_SCTP_SRC:
filter.SrcPort = ntohs(datum.Value)
case nl.TCA_FLOWER_KEY_TCP_DST, nl.TCA_FLOWER_KEY_UDP_DST, nl.TCA_FLOWER_KEY_SCTP_DST:
filter.DestPort = ntohs(datum.Value)
case nl.TCA_FLOWER_ACT: case nl.TCA_FLOWER_ACT:
tables, err := nl.ParseRouteAttr(datum.Value) tables, err := nl.ParseRouteAttr(datum.Value)
if err != nil { if err != nil {

12
filter_test.go
View File

@ -1771,7 +1771,7 @@ func TestFilterFlowerAddDel(t *testing.T) {
testMask := net.CIDRMask(24, 32) testMask := net.CIDRMask(24, 32)
ipproto := new(nl.IPProto) ipproto := new(nl.IPProto)
*ipproto = nl.IPPROTO_ICMP *ipproto = nl.IPPROTO_TCP
filter := &Flower{ filter := &Flower{
FilterAttrs: FilterAttrs{ FilterAttrs: FilterAttrs{
@ -1792,6 +1792,8 @@ func TestFilterFlowerAddDel(t *testing.T) {
EncDestPort: 8472, EncDestPort: 8472,
EncKeyId: 1234, EncKeyId: 1234,
IPProto: ipproto, IPProto: ipproto,
DestPort: 1111,
SrcPort: 1111,
Actions: []Action{ Actions: []Action{
&MirredAction{ &MirredAction{
ActionAttrs: ActionAttrs{ ActionAttrs: ActionAttrs{
@ -1860,9 +1862,15 @@ func TestFilterFlowerAddDel(t *testing.T) {
if filter.EncDestPort != flower.EncDestPort { if filter.EncDestPort != flower.EncDestPort {
t.Fatalf("Flower EncDestPort doesn't match") t.Fatalf("Flower EncDestPort doesn't match")
} }
if flower.IPProto != nil || *filter.IPProto != *flower.IPProto { if flower.IPProto == nil || *filter.IPProto != *flower.IPProto {
t.Fatalf("Flower IPProto doesn't match") t.Fatalf("Flower IPProto doesn't match")
} }
if filter.DestPort != flower.DestPort {
t.Fatalf("Flower DestPort doesn't match")
}
if filter.SrcPort != flower.SrcPort {
t.Fatalf("Flower SrcPort doesn't match")
}
mia, ok := flower.Actions[0].(*MirredAction) mia, ok := flower.Actions[0].(*MirredAction)
if !ok { if !ok {