From 5cf3fef8f7edc14d1f62750782901b8eec997b2a Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Wed, 29 Sep 2021 13:11:32 +0200 Subject: Remove `detected_protocol_stack` field from `ndpi_packet_struct` (#1317) This field is an exact copy of `ndpi_flow_struct->detected_protocol_stack[2]`: * at the very beginning of packet dissection, the value saved in `flow->detected_protocol_stack` is copied in `packet->detected_protocol_stack` (via `ndpi_detection_process_packet()` -> `ndpi_init_packet_header()`) * every time we update `flow->detected_protocol_stack` we update `packet->detected_protocol_stack` too (via `ndpi_int_change_protocol()` -> `ndpi_int_change_packet_protocol()`) These two fields are always in sync: keeping the same value in two different places is useless. --- src/lib/protocols/socks45.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/protocols/socks45.c') diff --git a/src/lib/protocols/socks45.c b/src/lib/protocols/socks45.c index 4f1451e59..29594d093 100644 --- a/src/lib/protocols/socks45.c +++ b/src/lib/protocols/socks45.c @@ -124,11 +124,11 @@ void ndpi_search_socks(struct ndpi_detection_module_struct *ndpi_struct, struct NDPI_LOG_DBG(ndpi_struct, "search SOCKS\n"); /* skip marked packets */ - if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_SOCKS) { + if(flow->detected_protocol_stack[0] != NDPI_PROTOCOL_SOCKS) { if(packet->tcp_retransmission == 0) { ndpi_check_socks4(ndpi_struct, flow); - if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_SOCKS) + if(flow->detected_protocol_stack[0] != NDPI_PROTOCOL_SOCKS) ndpi_check_socks5(ndpi_struct, flow); } } -- cgit v1.2.3