lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 10:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firewall/Diagnostics/Sessions: parse pftop internal data conversion (minor cleanups for https://github.com/opnsense/core/pull/6020)

Browse Source
This commit is contained in:
Ad Schellevis 2022-09-14 11:13:55 +02:00
parent 0f84667e37
commit f22c05ec61
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opnsense/scripts/filter/lib/states.py
View File

@ -204,7 +204,12 @@ def query_top(rule_label, filter_str):
record['age'] = parts[idx+1]
record['expire'] = parts[idx+2]
record['pkts'] = int(parts[idx+3]) if parts[idx+3].isdigit() else 0
record['bytes'] = int(parts[idx+4]) if parts[idx+4].isdigit() else 0 if parts[idx+4] == '*' else int(parts[idx+4][:-1])*pow(1024, pows[parts[idx+4][-1]])
if parts[idx+4].isdigit():
record['bytes'] = int(parts[idx+4])
elif parts[idx+4][:-1].isdigit() and parts[idx+4][-1] in pows:
record['bytes'] = int(parts[idx+4][:-1])*pow(1024, pows[parts[idx+4][-1]])
else:
record['bytes'] = 0
record['avg'] = int(parts[idx+5]) if parts[idx+5].isdigit() else 0
record['rule'] = parts[idx+6]
if record['rule'] in rule_labels:
@ -219,7 +224,7 @@ def query_top(rule_label, filter_str):
record[timefield] = int(tmp[0]) * 3600 + int(tmp[1]) * 60 + int(tmp[2]) if len(tmp) > 2 else 0
elif record[timefield].isdigit():
record[timefield] = int(record[timefield])
elif any(time_mark in record[timefield] for time_mark in list(time_marks.keys())):
elif record[timefield][-1] in time_marks and record[timefield][:-1].isdigit():
record[timefield] = int(record[timefield][:-1])*time_marks[record[timefield][-1]]
else:
record[timefield] = 0