Skip to content

Commit

Permalink
buff server recieve netlink rerpot (#29)
Browse files Browse the repository at this point in the history 
* buff server recieve netlink rerpot

* backward compatibility for buffnetlink

* update go-gtp5gnl and util pkg

* fix buff netlink err

* remove redundant

* upgrade expectedMinGtp5gVersion to 0.8.0

---------

Co-authored-by: Roy-Hu <80-ChienAn@users.noreply.gitlab.nems.cs.nctu.edu.tw>
Co-authored-by: Tim Liu <timliu@nctu.edu.tw>
  • Loading branch information
@Roy-Hu @tim-ywliu
3 people committed Mar 15, 2023
1 parent 7fc9b6f commit 2c4cc96
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 31 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.14
require (
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/davecgh/go-spew v1.1.1
github.com/free5gc/go-gtp5gnl v1.4.4
github.com/free5gc/util v1.0.4-0.20221214003641-2f381be59a5a
github.com/free5gc/go-gtp5gnl v1.4.5
github.com/free5gc/util v1.0.5-0.20230306071612-a52909216bd2
github.com/hashicorp/go-version v1.6.0
github.com/khirono/go-genl v1.0.1
github.com/khirono/go-nl v1.0.5
Expand Down
44 changes: 33 additions & 11 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
github.com/free5gc/go-gtp5gnl v1.4.4 h1:OXSbsdhrrVWZ5rQkez1w9gJcBfYVkn5cYuNkcXlqAcg=
github.com/free5gc/go-gtp5gnl v1.4.4/go.mod h1:TT5aXB90NuSPMehuIK9lV2yJFnq6Qjw37ZqNB1QAKh0=
github.com/free5gc/util v1.0.4-0.20221214003641-2f381be59a5a h1:m17BhPzT6V2ug4ArQAgvsBB20nwR6M5cIK0kYEsayX0=
github.com/free5gc/util v1.0.4-0.20221214003641-2f381be59a5a/go.mod h1:H0DjCCEcHsdokJC7+/fowtZ85QgT6UndyaiA/NSH/LM=
github.com/free5gc/go-gtp5gnl v1.4.5 h1:w4mHuEue4hwpnQdYc19C5sXmxvYLZ0s2vJyDNdmt2wk=
github.com/free5gc/go-gtp5gnl v1.4.5/go.mod h1:TT5aXB90NuSPMehuIK9lV2yJFnq6Qjw37ZqNB1QAKh0=
github.com/free5gc/util v1.0.5-0.20230306071612-a52909216bd2 h1:FG8KlJ46Epscj3F9XBAKuDGJD9kSKJdstCL9fttjUjE=
github.com/free5gc/util v1.0.5-0.20230306071612-a52909216bd2/go.mod h1:fgV0hXf5arxAWs8D9LfrrfNByZ1IDCWYlgBzncy5GtE=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.7.3 h1:aMBzLJ/GMEYmv1UWs2FFTcPISLrQH2mRgL9Glz8xows=
github.com/gin-gonic/gin v1.7.3/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/gin-gonic/gin v1.7.7 h1:3DoBmSbJbZAWqXJC3SLjAPfutPJJRN1U5pALB7EeTTs=
github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
Expand Down Expand Up @@ -99,32 +99,54 @@ github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT
github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.mongodb.org/mongo-driver v1.8.4/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f h1:aZp0e2vLN4MToVqnjNEYEtrEA8RH8U8FN1CU7JgqsPU=
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
94 changes: 78 additions & 16 deletions internal/forwarder/buffnetlink/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,15 @@ func (s *Server) Handle(handler report.Handler) {
s.handler = handler
}

func (s *Server) ServeMsg(msg *nl.Msg) bool {
b := msg.Body[genl.SizeofHeader:]

func decodbuffer(b []byte) (uint64, uint16, uint16, []byte, error) {
var pkt []byte
var seid uint64
var pdrid uint16
var action uint16

for len(b) > 0 {
hdr, n, err := nl.DecodeAttrHdr(b)
if err != nil {
return false
return 0, 0, 0, nil, err
}
switch hdr.MaskedType() {
case gtp5gnl.BUFFER_ID:
Expand All @@ -79,21 +76,86 @@ func (s *Server) ServeMsg(msg *nl.Msg) bool {
case gtp5gnl.BUFFER_PACKET:
pkt = b[n:int(hdr.Len)]
}

b = b[hdr.Len.Align():]
}

if s.handler != nil && pkt != nil {
dldr := report.DLDReport{
PDRID: pdrid,
Action: action,
BufPkt: pkt,
return seid, pdrid, action, pkt, nil
}

func (s *Server) ServeMsg(msg *nl.Msg) bool {
b := msg.Body[genl.SizeofHeader:]
var usars map[uint64][]report.USAReport

hdr, n, err := nl.DecodeAttrHdr(b)
if err != nil {
return false
}
switch hdr.MaskedType() {
case gtp5gnl.BUFFER:
seid, pdrid, action, pkt, err := decodbuffer(b[n:])
if err != nil {
return false
}

if s.handler != nil && pkt != nil {
dldr := report.DLDReport{
PDRID: pdrid,
Action: action,
BufPkt: pkt,
}
s.handler.NotifySessReport(
report.SessReport{
SEID: seid,
Reports: []report.Report{dldr},
},
)
}
case gtp5gnl.REPORT:
rs, err := gtp5gnl.DecodeAllUSAReports(b[n:])
if err != nil {
return false
}
if rs == nil {
return false
}

usars = make(map[uint64][]report.USAReport)
for _, r := range rs {
usar := report.USAReport{
URRID: r.URRID,
QueryUrrRef: r.QueryUrrRef,
StartTime: r.StartTime,
EndTime: r.EndTime,
}

usar.USARTrigger.SetReportingTrigger(r.USARTrigger)

usar.VolumMeasure = report.VolumeMeasure{
TotalVolume: r.VolMeasurement.TotalVolume,
UplinkVolume: r.VolMeasurement.UplinkVolume,
DownlinkVolume: r.VolMeasurement.DownlinkVolume,
TotalPktNum: r.VolMeasurement.TotalPktNum,
UplinkPktNum: r.VolMeasurement.UplinkPktNum,
DownlinkPktNum: r.VolMeasurement.DownlinkPktNum,
}
usars[r.SEID] = append(usars[r.SEID], usar)
}

for seid, rs := range usars {
var usars []report.Report
for _, r := range rs {
usars = append(usars, r)
}
s.handler.NotifySessReport(
report.SessReport{
SEID: seid,
Reports: usars,
},
)
}
s.handler.NotifySessReport(
report.SessReport{
SEID: seid,
Reports: []report.Report{dldr},
},
)
default:
return false
}

return true
Expand Down
4 changes: 2 additions & 2 deletions internal/forwarder/gtp5g.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
)

const (
expectedMinGtp5gVersion string = "0.7.3"
expectedMaxGtp5gVersion string = "0.8.0"
expectedMinGtp5gVersion string = "0.8.0"
expectedMaxGtp5gVersion string = "0.9.0"
SOCKPATH string = "/tmp/free5gc_unix_sock"
)

Expand Down
39 changes: 39 additions & 0 deletions internal/report/report.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,45 @@ type UsageReportTrigger struct {
Flags uint32
}

func (t *UsageReportTrigger) SetReportingTrigger(r uint32) {
switch r {
case RPT_TRIG_PERIO:
t.Flags |= USAR_TRIG_PERIO
case RPT_TRIG_VOLTH:
t.Flags |= USAR_TRIG_VOLTH
case RPT_TRIG_TIMTH:
t.Flags |= USAR_TRIG_TIMTH
case RPT_TRIG_QUHTI:
t.Flags |= USAR_TRIG_QUHTI
case RPT_TRIG_START:
t.Flags |= USAR_TRIG_START
case RPT_TRIG_STOPT:
t.Flags |= USAR_TRIG_STOPT
case RPT_TRIG_DROTH:
t.Flags |= USAR_TRIG_DROTH
case RPT_TRIG_LIUSA:
t.Flags |= USAR_TRIG_LIUSA
case RPT_TRIG_VOLQU:
t.Flags |= USAR_TRIG_VOLQU
case RPT_TRIG_TIMQU:
t.Flags |= USAR_TRIG_TIMQU
case RPT_TRIG_ENVCL:
t.Flags |= USAR_TRIG_ENVCL
case RPT_TRIG_MACAR:
t.Flags |= USAR_TRIG_MACAR
case RPT_TRIG_EVETH:
t.Flags |= USAR_TRIG_EVETH
case RPT_TRIG_EVEQU:
t.Flags |= USAR_TRIG_EVEQU
case RPT_TRIG_IPMJL:
t.Flags |= USAR_TRIG_IPMJL
case RPT_TRIG_QUVTI:
t.Flags |= USAR_TRIG_QUVTI
case RPT_TRIG_UPINT:
t.Flags |= USAR_TRIG_UPINT
}
}

func (t *UsageReportTrigger) IE() *ie.IE {
b := make([]byte, 4)
binary.LittleEndian.PutUint32(b, t.Flags)
Expand Down

0 comments on commit 2c4cc96

Please sign in to comment.