python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-07-09 01:05:53 +02:00
Code Issues Releases Activity

use convert_size_to_int()

Browse Source
This commit is contained in:
Kelly Brazil
2024-02-01 20:34:44 -08:00
parent c419e460db
commit 7fadb23fea
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
jc/parsers/iptables.py
View File

@ -163,7 +163,7 @@ import jc.utils
class info(): class info():
"""Provides parser metadata (version, author, etc.)""" """Provides parser metadata (version, author, etc.)"""
version = '1.9' version = '1.10'
description = '`iptables` command parser' description = '`iptables` command parser'
author = 'Kelly Brazil' author = 'Kelly Brazil'
author_email = 'kellyjonbrazil@gmail.com' author_email = 'kellyjonbrazil@gmail.com'
@ -195,28 +195,7 @@ def _process(proc_data):
rule[key] = jc.utils.convert_to_int(rule[key]) rule[key] = jc.utils.convert_to_int(rule[key])
if 'bytes' in rule: if 'bytes' in rule:
multiplier = 1 rule['bytes'] = jc.utils.convert_size_to_int(rule['bytes'])
if rule['bytes'][-1] == 'K':
multiplier = 10 ** 3
rule['bytes'] = rule['bytes'].rstrip('K')
elif rule['bytes'][-1] == 'M':
multiplier = 10 ** 6
rule['bytes'] = rule['bytes'].rstrip('M')
elif rule['bytes'][-1] == 'G':
multiplier = 10 ** 9
rule['bytes'] = rule['bytes'].rstrip('G')
elif rule['bytes'][-1] == 'T':
multiplier = 10 ** 12
rule['bytes'] = rule['bytes'].rstrip('T')
elif rule['bytes'][-1] == 'P':
multiplier = 10 ** 15
rule['bytes'] = rule['bytes'].rstrip('P')
try:
bytes_int = jc.utils.convert_to_int(rule['bytes'])
rule['bytes'] = bytes_int * multiplier
except (ValueError):
rule['bytes'] = None
if 'opt' in rule: if 'opt' in rule:
if rule['opt'] == '--': if rule['opt'] == '--':