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/attic/ftp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib/protocols/attic/ftp.c')

diff --git a/src/lib/protocols/attic/ftp.c b/src/lib/protocols/attic/ftp.c
index 1aa48b959..13b242b56 100644
--- a/src/lib/protocols/attic/ftp.c
+++ b/src/lib/protocols/attic/ftp.c
@@ -407,7 +407,7 @@ void ndpi_search_ftp_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
   if (src != NULL && ndpi_packet_dst_ip_eql(packet, &src->ftp_ip)
       && packet->tcp->syn != 0 && packet->tcp->ack == 0
-      && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
+      && flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
       && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask,
 					  NDPI_PROTOCOL_FTP) != 0 && src->ftp_timer_set != 0) {
     NDPI_LOG(NDPI_PROTOCOL_FTP, ndpi_struct, NDPI_LOG_DEBUG, "possible ftp data, src!= 0.\n");
@@ -425,7 +425,7 @@ void ndpi_search_ftp_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
   if (dst != NULL && ndpi_packet_src_ip_eql(packet, &dst->ftp_ip)
       && packet->tcp->syn != 0 && packet->tcp->ack == 0
-      && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
+      && flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
       && NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask,
 					  NDPI_PROTOCOL_FTP) != 0 && dst->ftp_timer_set != 0) {
     NDPI_LOG(NDPI_PROTOCOL_FTP, ndpi_struct, NDPI_LOG_DEBUG, "possible ftp data; dst!= 0.\n");
@@ -453,7 +453,7 @@ void ndpi_search_ftp_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
   /* skip excluded connections */
 
   // we test for FTP connection and search for passive mode
-  if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_FTP) {
+  if (flow->detected_protocol_stack[0] == NDPI_PROTOCOL_FTP) {
     NDPI_LOG(NDPI_PROTOCOL_FTP, ndpi_struct, NDPI_LOG_DEBUG,
 	     "detected ftp command mode. going to test data mode.\n");
     search_passive_ftp_mode(ndpi_struct, flow);
@@ -463,7 +463,7 @@ void ndpi_search_ftp_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
   }
 
 
-  if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN && search_ftp(ndpi_struct, flow) != 0) {
+  if (flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN && search_ftp(ndpi_struct, flow) != 0) {
     NDPI_LOG(NDPI_PROTOCOL_FTP, ndpi_struct, NDPI_LOG_DEBUG, "unknown. need next packet.\n");
 
     return;
-- 
cgit v1.2.3