Skip to content
This repository was archived by the owner on Feb 19, 2025. It is now read-only.

fix decode sflow ipv4/ipv6 data binary.Read() err #130

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix decode sflow ipv4/ipv6 data binary.Read() err #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions decoders/sflow/sflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,22 @@ func DecodeFlowRecord(header *RecordHeader, payload *bytes.Buffer) (FlowRecord,
}
sampledHeader.HeaderData = payload.Bytes()
flowRecord.Data = sampledHeader
case FORMAT_ETH:
sampledEth := SampledEthernet{
SrcMac: make([]byte, 8),
DstMac: make([]byte, 8),
}
err := utils.BinaryDecoder(payload, &(sampledEth.Length), &(sampledEth.SrcMac), &(sampledEth.DstMac), &(sampledEth.EthType))
if err != nil {
return flowRecord, err
}
flowRecord.Data = sampledEth
case FORMAT_IPV4:
sampledIPBase := SampledIP_Base{
SrcIP: make([]byte, 4),
DstIP: make([]byte, 4),
}
err := utils.BinaryDecoder(payload, &sampledIPBase)
err := utils.BinaryDecoder(payload, &(sampledIPBase.Length), &(sampledIPBase.Protocol), &(sampledIPBase.SrcIP), &(sampledIPBase.DstIP), &(sampledIPBase.SrcPort), &(sampledIPBase.DstPort), &(sampledIPBase.TcpFlags))
if err != nil {
return flowRecord, err
}
Expand All @@ -168,7 +178,7 @@ func DecodeFlowRecord(header *RecordHeader, payload *bytes.Buffer) (FlowRecord,
SrcIP: make([]byte, 16),
DstIP: make([]byte, 16),
}
err := utils.BinaryDecoder(payload, &sampledIPBase)
err := utils.BinaryDecoder(payload, &(sampledIPBase.Length), &(sampledIPBase.Protocol), &(sampledIPBase.SrcIP), &(sampledIPBase.DstIP), &(sampledIPBase.SrcPort), &(sampledIPBase.DstPort), &(sampledIPBase.TcpFlags))
if err != nil {
return flowRecord, err
}
Expand Down