From 0de1dff0253eb46b7336103f62f888940406ccc0 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Thu, 17 Oct 2019 08:09:19 -0700 Subject: [PATCH] fix ands --- jc/parsers/netstat.py | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/jc/parsers/netstat.py b/jc/parsers/netstat.py index a2da1e55..36211c61 100644 --- a/jc/parsers/netstat.py +++ b/jc/parsers/netstat.py @@ -89,39 +89,39 @@ def parse(data): else: state.network = 'ipv4' - if state.section == client && state.session == tcp && state.network == ipv4: - client_tcp_ip4.append(parse_line(line)) + if state.section == client and state.session == tcp and state.network == ipv4: + state.client_tcp_ip4.append(parse_line(line)) - if state.section == client && state.session == tcp && state.network == ipv6: - client_tcp_ip6.append(parse_line(line)) + if state.section == client and state.session == tcp and state.network == ipv6: + state.client_tcp_ip6.append(parse_line(line)) - if state.section == client && state.session == udp && state.network == ipv4: - client_udp_ip4.append(parse_line(line)) + if state.section == client and state.session == udp and state.network == ipv4: + state.client_udp_ip4.append(parse_line(line)) - if state.section == client && state.session == udp && state.network == ipv6: - client_udp_ip6.append(parse_line(line)) + if state.section == client and state.session == udp and state.network == ipv6: + state.client_udp_ip6.append(parse_line(line)) - if state.section == server && state.session == tcp && state.network == ipv4: - server_tcp_ip4.append(parse_line(line)) + if state.section == server and state.session == tcp and state.network == ipv4: + state.server_tcp_ip4.append(parse_line(line)) - if state.section == client && state.session == tcp && state.network == ipv6: - server_tcp_ip6.append(parse_line(line)) + if state.section == client and state.session == tcp and state.network == ipv6: + state.server_tcp_ip6.append(parse_line(line)) - if state.section == client && state.session == udp && state.network == ipv4: - server_udp_ip4.append(parse_line(line)) + if state.section == client and state.session == udp and state.network == ipv4: + state.server_udp_ip4.append(parse_line(line)) - if state.section == client && state.session == udp && state.network == ipv6: - server_udp_ip6.append(parse_line(line)) + if state.section == client and state.session == udp and state.network == ipv6: + state.server_udp_ip6.append(parse_line(line)) - output['client']['tcp']['ipv4'] = client_tcp_ip4 - output['client']['tcp']['ipv6'] = client_tcp_ip6 - output['client']['udp']['ipv4'] = client_udp_ip4 - output['client']['udp']['ipv6'] = client_udp_ip6 + output['client']['tcp']['ipv4'] = state.client_tcp_ip4 + output['client']['tcp']['ipv6'] = state.client_tcp_ip6 + output['client']['udp']['ipv4'] = state.client_udp_ip4 + output['client']['udp']['ipv6'] = state.client_udp_ip6 - output['server']['tcp']['ipv4'] = server_tcp_ip4 - output['server']['tcp']['ipv6'] = server_tcp_ip6 - output['server']['udp']['ipv4'] = server_udp_ip4 - output['server']['udp']['ipv6'] = server_udp_ip6 + output['server']['tcp']['ipv4'] = state.server_tcp_ip4 + output['server']['tcp']['ipv6'] = state.server_tcp_ip6 + output['server']['udp']['ipv4'] = state.server_udp_ip4 + output['server']['udp']['ipv6'] = state.server_udp_ip6 return output \ No newline at end of file