Skip to content

Fix v5 inByte/inPackets handling #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Fix v5 inByte/inPackets handling #155

Show file tree
Hide file tree
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
21 changes: 17 additions & 4 deletions formatter/ntopng_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,24 @@ func (d *NtopngJson) toJSON(extFlow *proto.ExtendedFlowMessage) ([]byte, error)
// Stats + direction
// goflow2 only supports unidirectional flows. There is no Direction field and only one
// Bytes/Packets field. Data flow is always Src -> Dst.
//
// For NetFlow v9/IPFIX, bytes/packets arrive via the mapping.yaml remapping into the
// custom ExtendedFlowMessage fields (200-203). For NetFlow v5 (fixed format), the
// producer bypasses that remapping and writes directly to FlowMessage.Bytes/Packets,
// so fall back to those when the custom fields are unpopulated.
inBytes := uint64(extFlow.InBytes)
if inBytes == 0 {
inBytes = baseFlow.Bytes
}
inPackets := uint64(extFlow.InPackets)
if inPackets == 0 {
inPackets = baseFlow.Packets
}
retmap[strconv.Itoa(netflow.NFV9_FIELD_DIRECTION)] = 0
retmap[strconv.Itoa(netflow.NFV9_FIELD_IN_BYTES)] = extFlow.InBytes
retmap[strconv.Itoa(netflow.NFV9_FIELD_IN_PKTS)] = extFlow.InPackets
retmap[strconv.Itoa(netflow.NFV9_FIELD_OUT_BYTES)] = extFlow.OutBytes
retmap[strconv.Itoa(netflow.NFV9_FIELD_OUT_PKTS)] = extFlow.OutPackets
retmap[strconv.Itoa(netflow.NFV9_FIELD_IN_BYTES)] = inBytes
retmap[strconv.Itoa(netflow.NFV9_FIELD_IN_PKTS)] = inPackets
retmap[strconv.Itoa(netflow.NFV9_FIELD_OUT_BYTES)] = uint64(extFlow.OutBytes)
retmap[strconv.Itoa(netflow.NFV9_FIELD_OUT_PKTS)] = uint64(extFlow.OutPackets)
// Goflow2 protobuf provides time in ns, but it ntopng expects time in seconds.
retmap[strconv.Itoa(netflow.NFV9_FIELD_FIRST_SWITCHED)] =
uint32(baseFlow.TimeFlowStartNs / 1_000_000_000)
Expand Down
21 changes: 17 additions & 4 deletions formatter/ntopng_tlv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,25 @@ func (d *NtopngTlv) toTLV(extFlow *proto.ExtendedFlowMessage) ([]byte, error) {
// Stats + direction
// goflow2 only supports unidirectional flows. There is no Direction field and only one
// Bytes/Packets field. Data flow is always Src -> Dst
//
// For NetFlow v9/IPFIX, bytes/packets arrive via the mapping.yaml remapping into the
// custom ExtendedFlowMessage fields (200-203). For NetFlow v5 (fixed format), the
// producer bypasses that remapping and writes directly to FlowMessage.Bytes/Packets,
// so fall back to those when the custom fields are unpopulated.
inBytes := uint64(extFlow.InBytes)
if inBytes == 0 {
inBytes = baseFlow.Bytes
}
inPackets := uint64(extFlow.InPackets)
if inPackets == 0 {
inPackets = baseFlow.Packets
}
items = append(items,
ndpiItem{Key: netflow.NFV9_FIELD_DIRECTION, Value: 0},
ndpiItem{Key: netflow.NFV9_FIELD_IN_BYTES, Value: extFlow.InBytes},
ndpiItem{Key: netflow.NFV9_FIELD_IN_PKTS, Value: extFlow.InPackets},
ndpiItem{Key: netflow.NFV9_FIELD_OUT_BYTES, Value: extFlow.OutBytes},
ndpiItem{Key: netflow.NFV9_FIELD_OUT_PKTS, Value: extFlow.OutPackets},
ndpiItem{Key: netflow.NFV9_FIELD_IN_BYTES, Value: inBytes},
ndpiItem{Key: netflow.NFV9_FIELD_IN_PKTS, Value: inPackets},
ndpiItem{Key: netflow.NFV9_FIELD_OUT_BYTES, Value: uint64(extFlow.OutBytes)},
ndpiItem{Key: netflow.NFV9_FIELD_OUT_PKTS, Value: uint64(extFlow.OutPackets)},
)
// Goflow2 protobuf provides time in ns, but it ntopng expects time in seconds.
items = append(items,
Expand Down