From 3640671fc6a67c9628fd47e19e9fe0a0738439ce Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Fri, 29 May 2020 14:15:28 -0700 Subject: [PATCH] rename module --- jc/parsers/{netstat_osx.py => netstat_freebsd_osx.py} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename jc/parsers/{netstat_osx.py => netstat_freebsd_osx.py} (97%) diff --git a/jc/parsers/netstat_osx.py b/jc/parsers/netstat_freebsd_osx.py similarity index 97% rename from jc/parsers/netstat_osx.py rename to jc/parsers/netstat_freebsd_osx.py index a95d3aaf..c3d5b770 100644 --- a/jc/parsers/netstat_osx.py +++ b/jc/parsers/netstat_freebsd_osx.py @@ -1,4 +1,4 @@ -"""jc - JSON CLI output utility OSX and FreeBSD netstat Parser""" +"""jc - JSON CLI output utility FreeBSD and OSX netstat Parser""" def normalize_headers(header): @@ -6,8 +6,8 @@ def normalize_headers(header): header = header.replace('local address', 'local_address') 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('inode', 'unix_inode') + header = header.replace('flags', 'unix_flags') header = header.replace('-', '_') return header @@ -170,7 +170,7 @@ def parse(cleandata): interface_table = False continue - if line.startswith('Active LOCAL (UNIX) domain sockets'): + if line.startswith('Active LOCAL (UNIX) domain sockets') or line.startswith('Active UNIX domain sockets'): network = False multipath = False socket = True @@ -237,7 +237,7 @@ def parse(cleandata): # don't continue since there is no real header row for this table # get headers - if network and (line.startswith('Socket ') or line.startswith('Proto ')): + if network and (line.startswith('Socket ') or line.startswith('Proto ') or line.startswith('Tcpcb ')): header_text = normalize_headers(line) headers = header_text.split() continue