From 9c4fa2ae2601ca4880c0b078fa917f01f1392e0e Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Wed, 20 May 2020 15:39:47 -0700 Subject: [PATCH] integer conversions and icmp fix --- jc/parsers/netstat.py | 21 +++++++++++++++++++-- jc/parsers/netstat_osx.py | 3 +++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/jc/parsers/netstat.py b/jc/parsers/netstat.py index d56df974..b63db6e7 100644 --- a/jc/parsers/netstat.py +++ b/jc/parsers/netstat.py @@ -359,13 +359,30 @@ def process(proc_data): "type": string, "inode": integer, "path": string, - "kind": string + "kind": string, + "address": string, + "osx_inode": string, + "conn": string, + "refs": string, + "nextref": string, + "name": string, + "unit": integer, + "vendor": integer, + "class": integer, + "subcla": integer, + "osx_flags": integer, + "pcbcount": integer, + "rcvbuf": integer, + "sndbuf": integer, + "rxbytes": integer, + "txbytes": integer } ] """ for entry in proc_data: # integer changes - int_list = ['recv_q', 'send_q', 'pid', 'refcnt', 'inode'] + int_list = ['recv_q', 'send_q', 'pid', 'refcnt', 'inode', 'unit', 'vendor', 'class', + 'osx_flags', 'subcla', 'pcbcount', 'rcvbuf', 'sndbuf', 'rxbytes', 'txbytes'] for key in int_list: if key in entry: try: diff --git a/jc/parsers/netstat_osx.py b/jc/parsers/netstat_osx.py index 2cde8c21..cbf070bd 100644 --- a/jc/parsers/netstat_osx.py +++ b/jc/parsers/netstat_osx.py @@ -7,6 +7,7 @@ def normalize_headers(header): header = header.replace('foreign address', 'foreign_address') header = header.replace('(state)', 'state') header = header.replace('inode', 'osx_inode') + header = header.replace('flags', 'osx_flags') header = header.replace('-', '_') return header @@ -48,6 +49,8 @@ def parse_post(raw_data): if entry['kind'] == 'network': if entry['proto'] == 'udp46': entry['transport_protocol'] = entry['proto'][:-2] + elif entry['proto'].startswith('icm'): + entry['transport_protocol'] = 'icmp' else: entry['transport_protocol'] = entry['proto'][:-1]