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

change 'request_timeout' field to 'type', fix compatibility, other formatting fixes

Browse Source
This commit is contained in:
Kelly Brazil
2020-07-19 12:56:34 -07:00
parent cc60f36748
commit f9eb18b927
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jc/parsers/ping.py
View File

@ -6,7 +6,7 @@ Usage:
Compatibility: Compatibility:
'linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd' 'linux', 'darwin', 'cygwin', 'freebsd'
Examples: Examples:
@ -28,7 +28,7 @@ class info():
# details = 'enter any other details here' # details = 'enter any other details here'
# compatible options: linux, darwin, cygwin, win32, aix, freebsd # compatible options: linux, darwin, cygwin, win32, aix, freebsd
compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd'] compatible = ['linux', 'darwin', 'cygwin', 'freebsd']
magic_commands = ['ping', 'ping6'] magic_commands = ['ping', 'ping6']
@ -146,7 +146,7 @@ def linux_parse(data):
isequence = 6 isequence = 6
response = { response = {
'request_timeout': True, 'type': 'timeout',
'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]
} }
@ -155,7 +155,7 @@ def linux_parse(data):
# normal responses # normal responses
else: else:
hostname = True if '(' in line else False
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
@ -175,7 +175,7 @@ def linux_parse(data):
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 = { response = {
'request_timeout': False, 'type': 'reply',
'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(':'),
@ -253,7 +253,7 @@ def bsd_parse(data):
# request timeout # request timeout
if line.startswith('Request timeout for '): if line.startswith('Request timeout for '):
response = { response = {
'request_timeout': True, 'type': 'timeout',
'icmp_seq': line.split()[4] 'icmp_seq': line.split()[4]
} }
ping_responses.append(response) ping_responses.append(response)
@ -263,7 +263,7 @@ def bsd_parse(data):
else: else:
line = line.replace(':', ' ').replace('=', ' ') line = line.replace(':', ' ').replace('=', ' ')
response = { response = {
'request_timeout': False, 'type': 'reply',
'bytes': line.split()[0], 'bytes': line.split()[0],
'response_ip': line.split()[3], 'response_ip': line.split()[3],
'icmp_seq': line.split()[5], 'icmp_seq': line.split()[5],
@ -277,7 +277,7 @@ def bsd_parse(data):
else: else:
line = line.replace(',', ' ').replace('=', ' ') line = line.replace(',', ' ').replace('=', ' ')
response = { response = {
'request_timeout': False, 'type': 'reply',
'bytes': line.split()[0], 'bytes': line.split()[0],
'response_ip': line.split()[3], 'response_ip': line.split()[3],
'icmp_seq': line.split()[5], 'icmp_seq': line.split()[5],
@ -322,4 +322,3 @@ def parse(data, raw=False, quiet=False):
return raw_output return raw_output
else: else:
return process(raw_output) return process(raw_output)