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

add pattern support. move unparsable line detection to standard streaming parser style

Browse Source
This commit is contained in:
Kelly Brazil
2021-09-13 19:50:51 -07:00
parent 51271fea0f
commit 2d6b53e012
1 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jc/parsers/ping_s.py
View File

@ -86,12 +86,13 @@ def parse(data, raw=False, quiet=False):
if not quiet: if not quiet:
jc.utils.compatibility(__name__, info.compatible) jc.utils.compatibility(__name__, info.compatible)
pattern = None
footer = False
for line in data: for line in data:
try: try:
output_line = {} output_line = {}
ping_responses = [] # ping_responses = []
pattern = None
footer = False
# check for PATTERN # check for PATTERN
if line.startswith('PATTERN: '): if line.startswith('PATTERN: '):
@ -183,14 +184,13 @@ def parse(data, raw=False, quiet=False):
timestamp = True timestamp = True
isequence = 6 isequence = 6
response = { output_line = {
'type': 'timeout', 'type': 'timeout',
'pattern': pattern or None,
'timestamp': line.split()[0].lstrip('[').rstrip(']') if timestamp else None, 'timestamp': line.split()[0].lstrip('[').rstrip(']') if timestamp else None,
'icmp_seq': line.replace('=', ' ').split()[isequence] 'icmp_seq': line.replace('=', ' ').split()[isequence]
} }
output_line.update(response)
if quiet: if quiet:
output_line['_meta'] = {'success': True} output_line['_meta'] = {'success': True}
@ -203,7 +203,7 @@ def parse(data, raw=False, quiet=False):
# normal responses # normal responses
elif ' bytes from ' in line: elif ' bytes from ' in line:
try:
line = line.replace('(', ' ').replace(')', ' ').replace('=', ' ') line = line.replace('(', ' ').replace(')', ' ').replace('=', ' ')
# positions of items depend on whether ipv4/ipv6 and/or ip/hostname is used # positions of items depend on whether ipv4/ipv6 and/or ip/hostname is used
@ -222,8 +222,9 @@ def parse(data, raw=False, quiet=False):
timestamp = True timestamp = True
bts, rip, iseq, t2l, tms = (bts + 1, rip + 1, iseq + 1, t2l + 1, tms + 1) bts, rip, iseq, t2l, tms = (bts + 1, rip + 1, iseq + 1, t2l + 1, tms + 1)
response = { output_line = {
'type': 'reply', 'type': 'reply',
'pattern': pattern or None,
'timestamp': line.split()[0].lstrip('[').rstrip(']') if timestamp else None, 'timestamp': line.split()[0].lstrip('[').rstrip(']') if timestamp else None,
'bytes': line.split()[bts], 'bytes': line.split()[bts],
'response_ip': line.split()[rip].rstrip(':'), 'response_ip': line.split()[rip].rstrip(':'),
@ -232,13 +233,6 @@ def parse(data, raw=False, quiet=False):
'time_ms': line.split()[tms], 'time_ms': line.split()[tms],
'duplicate': True if 'DUP!' in line else False 'duplicate': True if 'DUP!' in line else False
} }
except Exception:
response = {
'type': 'unparsable_line',
'unparsed_line': line
}
output_line.update(response)
if quiet: if quiet:
output_line['_meta'] = {'success': True} output_line['_meta'] = {'success': True}