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.
This commit is contained in:
@@ -57,7 +57,7 @@ void ndpi_search_rtsp_tcp_udp(struct ndpi_detection_module_struct
|
||||
}
|
||||
|
||||
if (flow->rtsprdt_stage == 0
|
||||
&& !(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_RTCP)
|
||||
&& !(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_RTCP)
|
||||
) {
|
||||
flow->rtsprdt_stage = 1 + packet->packet_direction;
|
||||
NDPI_LOG_DBG2(ndpi_struct, "maybe handshake 1; need next packet, return\n");
|
||||
@@ -87,7 +87,7 @@ void ndpi_search_rtsp_tcp_udp(struct ndpi_detection_module_struct
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->udp != NULL && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
if (packet->udp != NULL && flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
&& ((NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_RTP) == 0)
|
||||
|| (NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_RTCP) == 0)
|
||||
)) {
|
||||
|
||||
Reference in New Issue
Block a user