1
0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-19 00:17:51 +02:00

change osx_inode and osx_flags to unix_inode and unix_flags. Also rename netstat_osx module to netstat_freebsd_osx

This commit is contained in:
Kelly Brazil
2020-05-29 14:14:37 -07:00
parent 2128763ee6
commit b10ca64646

View File

@ -264,77 +264,77 @@ def process(proc_data):
[ [
{ {
"proto": string, "proto": string,
"recv_q": integer, "recv_q": integer,
"send_q": integer, "send_q": integer,
"transport_protocol" string, "transport_protocol" string,
"network_protocol": string, "network_protocol": string,
"local_address": string, "local_address": string,
"local_port": string, "local_port": string,
"local_port_num": integer, "local_port_num": integer,
"foreign_address": string, "foreign_address": string,
"foreign_port": string, "foreign_port": string,
"foreign_port_num": integer, "foreign_port_num": integer,
"state": string, "state": string,
"program_name": string, "program_name": string,
"pid": integer, "pid": integer,
"user": string, "user": string,
"security_context": string, "security_context": string,
"refcnt": integer, "refcnt": integer,
"flags": string, "flags": string,
"type": string, "type": string,
"inode": integer, "inode": integer,
"path": string, "path": string,
"kind": string, "kind": string,
"address": string, "address": string,
"osx_inode": string, "unix_inode": string,
"conn": string, "conn": string,
"refs": string, "refs": string,
"nextref": string, "nextref": string,
"name": string, "name": string,
"unit": integer, "unit": integer,
"vendor": integer, "vendor": integer,
"class": integer, "class": integer,
"subcla": integer, "subcla": integer,
"osx_flags": integer, "unix_flags": integer,
"pcbcount": integer, "pcbcount": integer,
"rcvbuf": integer, "rcvbuf": integer,
"sndbuf": integer, "sndbuf": integer,
"rxbytes": integer, "rxbytes": integer,
"txbytes": integer, "txbytes": integer,
"destination": string, "destination": string,
"gateway": string, "gateway": string,
"route_flags": string, "route_flags": string,
"route_flags_pretty": [ "route_flags_pretty": [
string, string,
] ]
"route_refs": integer, "route_refs": integer,
"use": integer, "use": integer,
"mtu": integer, "mtu": integer,
"expire": string, "expire": string,
"genmask": string, "genmask": string,
"mss": integer, "mss": integer,
"window": integer, "window": integer,
"irtt": integer, "irtt": integer,
"iface": string, "iface": string,
"metric": integer, "metric": integer,
"network": string, "network": string,
"address": string, "address": string,
"ipkts": integer, - = null "ipkts": integer, - = null
"ierrs": integer, - = null "ierrs": integer, - = null
"idrop": integer, - = null "idrop": integer, - = null
"opkts": integer, - = null "opkts": integer, - = null
"oerrs": integer, - = null "oerrs": integer, - = null
"coll": integer, - = null "coll": integer, - = null
"rx_ok": integer, "rx_ok": integer,
"rx_err": integer, "rx_err": integer,
"rx_drp": integer, "rx_drp": integer,
"rx_ovr": integer, "rx_ovr": integer,
"tx_ok": integer, "tx_ok": integer,
"tx_err": integer, "tx_err": integer,
"tx_drp": integer, "tx_drp": integer,
"tx_ovr": integer, "tx_ovr": integer,
"flg": string "flg": string
} }
] ]
""" """
@ -403,8 +403,8 @@ def parse(data, raw=False, quiet=False):
or cleandata[0].startswith('Name '): or cleandata[0].startswith('Name '):
# or cleandata[0] == 'Name Mtu Network Address Ipkts Ierrs Opkts Oerrs Coll' \ # or cleandata[0] == 'Name Mtu Network Address Ipkts Ierrs Opkts Oerrs Coll' \
import jc.parsers.netstat_osx import jc.parsers.netstat_freebsd_osx
raw_output = jc.parsers.netstat_osx.parse(cleandata) raw_output = jc.parsers.netstat_freebsd_osx.parse(cleandata)
# use linux parser # use linux parser
else: else: