python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-25 00:37:31 +02:00
Code Issues Releases Activity

iptables code optimizations

Browse Source
This commit is contained in:
Kelly Brazil
2020-06-22 10:47:34 -07:00
parent 69018cdb3a
commit 09e8f379a6
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jc/parsers/iptables.py
View File

@ -194,19 +194,19 @@ def process(proc_data):
if 'bytes' in rule: if 'bytes' in rule:
multiplier = 1 multiplier = 1
if rule['bytes'][-1] == 'K': if rule['bytes'][-1] == 'K':
multiplier = 1000 multiplier = 10 ** 3
rule['bytes'] = rule['bytes'].rstrip('K') rule['bytes'] = rule['bytes'].rstrip('K')
elif rule['bytes'][-1] == 'M': elif rule['bytes'][-1] == 'M':
multiplier = 1000000 multiplier = 10 ** 6
rule['bytes'] = rule['bytes'].rstrip('M') rule['bytes'] = rule['bytes'].rstrip('M')
elif rule['bytes'][-1] == 'G': elif rule['bytes'][-1] == 'G':
multiplier = 1000000000 multiplier = 10 ** 9
rule['bytes'] = rule['bytes'].rstrip('G') rule['bytes'] = rule['bytes'].rstrip('G')
elif rule['bytes'][-1] == 'T': elif rule['bytes'][-1] == 'T':
multiplier = 1000000000000 multiplier = 10 ** 12
rule['bytes'] = rule['bytes'].rstrip('T') rule['bytes'] = rule['bytes'].rstrip('T')
elif rule['bytes'][-1] == 'P': elif rule['bytes'][-1] == 'P':
multiplier = 1000000000000000 multiplier = 10 ** 15
rule['bytes'] = rule['bytes'].rstrip('P') rule['bytes'] = rule['bytes'].rstrip('P')
try: try:
@ -243,14 +243,14 @@ def parse(data, raw=False, quiet=False):
chain = {} chain = {}
headers = [] headers = []
cleandata = data.splitlines()
if jc.utils.has_data(data): if jc.utils.has_data(data):
for line in cleandata: for line in list(filter(None, data.splitlines())):
if line.startswith('Chain'): if line.startswith('Chain'):
raw_output.append(chain) if chain:
raw_output.append(chain)
chain = {} chain = {}
headers = [] headers = []
@ -274,8 +274,6 @@ def parse(data, raw=False, quiet=False):
if temp_rule: if temp_rule:
chain['rules'].append(temp_rule) chain['rules'].append(temp_rule)
raw_output = list(filter(None, raw_output))
if raw: if raw:
return raw_output return raw_output
else: else: