dprevot/netflow
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Performance improvement: rearrange code so that instead of converting IP addresses to integers first, we construct them from bytes directly

Browse source
This commit is contained in:
Anze 2022-05-08 17:52:51 +02:00
parent ef99464fc5
commit b10dc5faef
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
netflow/v9.py
View file

@ -218,21 +218,20 @@ class V9DataFlowSet:
# The length of the value byte slice is defined in the template
dataslice = data[offset:offset + flen]
# Better solution than struct.unpack with variable field length
fdata = 0
for idx, byte in enumerate(reversed(bytearray(dataslice))):
fdata += byte << (idx * 8)
# Special handling of IP addresses to convert integers to strings to not lose precision in dump
# TODO: might only be needed for IPv6
if field.field_type in FIELD_TYPES_CONTAINING_IP:
try:
ip = ipaddress.ip_address(fdata)
ip = ipaddress.ip_address(dataslice)
except ValueError:
print("IP address could not be parsed: {}".format(fdata))
continue
new_record.data[fkey] = ip.compressed
else:
# Better solution than struct.unpack with variable field length
fdata = 0
for idx, byte in enumerate(reversed(bytearray(dataslice))):
fdata += byte << (idx * 8)
new_record.data[fkey] = fdata
offset += flen