mirror/netsampler-goflow2
1
0
Fork 0
mirror of https://github.com/netsampler/goflow2.git synced 2024-05-06 15:54:52 +00:00
Code Issues Projects Releases Wiki Activity

bugfix: check etype size before decoding (#252)

Browse Source
This commit is contained in:
Louis
2023-12-12 18:44:59 -08:00
committed by GitHub
parent 1a5d58e3cf
commit 3f017c46b0
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
producer/proto/producer_sf.go
View File

@ -200,22 +200,37 @@ func ParseICMPv6(offset int, flowMessage *ProtoProducerMessage, data []byte) (ne
}
func IsMPLS(etherType []byte) bool {
if len(etherType) != 2 {
return false
}
return etherType[0] == 0x88 && etherType[1] == 0x47
}
func Is8021Q(etherType []byte) bool {
if len(etherType) != 2 {
return false
}
return etherType[0] == 0x81 && etherType[1] == 0x0
}
func IsIPv4(etherType []byte) bool {
if len(etherType) != 2 {
return false
}
return etherType[0] == 0x8 && etherType[1] == 0x0
}
func IsIPv6(etherType []byte) bool {
if len(etherType) != 2 {
return false
}
return etherType[0] == 0x86 && etherType[1] == 0xdd
}
func IsARP(etherType []byte) bool {
if len(etherType) != 2 {
return false
}
return etherType[0] == 0x8 && etherType[1] == 0x6
}
@ -238,6 +253,10 @@ func ParseEthernetHeader(flowMessage *ProtoProducerMessage, data []byte, config
return err
}
if len(etherType) != 2 {
return nil
}
encap := true
iterations := 0
for encap && iterations <= 1 {
@ -371,7 +390,9 @@ func ParseEthernetHeader(flowMessage *ProtoProducerMessage, data []byte, config
iterations++
}
if len(etherType) >= 2 {
flowMessage.Etype = uint32(binary.BigEndian.Uint16(etherType[0:2]))
}
flowMessage.Proto = uint32(nextHeader)
return nil