diff --git a/README.md b/README.md index 7504994c..da98d7d1 100755 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ $ ls -l /bin | jc --ls -p $ netstat -p | jc --netstat -p [ { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "localhost.localdo", "local_port": "34480", @@ -186,7 +186,7 @@ $ netstat -p | jc --netstat -p "send_q": 0 }, { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "localhost.localdo", "local_port": "34478", @@ -204,7 +204,7 @@ $ netstat -p | jc --netstat -p $ netstat -lpn | jc --netstat -p [ { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "127.0.0.1", "local_port": "42351", @@ -217,7 +217,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "127.0.0.53", "local_port": "53", @@ -230,7 +230,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "0.0.0.0", "local_port": "22", @@ -243,7 +243,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv6", "local_address": "::", "local_port": "22", @@ -256,7 +256,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "udp", + "transport_protocol": "udp", "network_protocol": "ipv4", "local_address": "127.0.0.53", "local_port": "53", @@ -268,7 +268,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "udp", + "transport_protocol": "udp", "network_protocol": "ipv4", "local_address": "192.168.71.131", "local_port": "68", diff --git a/changelog.txt b/changelog.txt index 31dfa66e..98ff7973 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,6 @@ jc changelog -20191021 v0.6.3 +20191021 v0.6.4 - Flatten netstat parser output - Clean up argument parsing - Fix command help diff --git a/jc/parsers/netstat.py b/jc/parsers/netstat.py index de5a460c..dafc2f37 100644 --- a/jc/parsers/netstat.py +++ b/jc/parsers/netstat.py @@ -13,7 +13,7 @@ Examples: $ netstat -p | jc --netstat -p [ { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "localhost.localdo", "local_port": "34480", @@ -26,7 +26,7 @@ $ netstat -p | jc --netstat -p "send_q": 0 }, { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "localhost.localdo", "local_port": "34478", @@ -43,7 +43,7 @@ $ netstat -p | jc --netstat -p $ netstat -lpn | jc --netstat -p [ { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "127.0.0.1", "local_port": "42351", @@ -56,7 +56,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "127.0.0.53", "local_port": "53", @@ -69,7 +69,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv4", "local_address": "0.0.0.0", "local_port": "22", @@ -82,7 +82,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "tcp", + "transport_protocol": "tcp", "network_protocol": "ipv6", "local_address": "::", "local_port": "22", @@ -95,7 +95,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "udp", + "transport_protocol": "udp", "network_protocol": "ipv4", "local_address": "127.0.0.53", "local_port": "53", @@ -107,7 +107,7 @@ $ netstat -lpn | jc --netstat -p "send_q": 0 }, { - "session_protocol": "udp", + "transport_protocol": "udp", "network_protocol": "ipv4", "local_address": "192.168.71.131", "local_port": "68", @@ -129,7 +129,7 @@ def parse_line(entry): output_line = {} if entry.find('tcp') == 0: - output_line['session_protocol'] = 'tcp' + output_line['transport_protocol'] = 'tcp' if entry.find('p6') == 2: output_line['network_protocol'] = 'ipv6' @@ -138,7 +138,7 @@ def parse_line(entry): output_line['network_protocol'] = 'ipv4' elif entry.find('udp') == 0: - output_line['session_protocol'] = 'udp' + output_line['transport_protocol'] = 'udp' if entry.find('p6') == 2: output_line['network_protocol'] = 'ipv6' diff --git a/setup.py b/setup.py index 05fea703..ac5088ab 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open('README.md', 'r') as f: setuptools.setup( name='jc', - version='0.6.3', + version='0.6.4', author='Kelly Brazil', author_email='kellyjonbrazil@gmail.com', description='This tool serializes the output of popular command line tools to structured JSON output.',