diff options
| author | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2021-09-29 13:11:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 13:11:32 +0200 |
| commit | 5cf3fef8f7edc14d1f62750782901b8eec997b2a (patch) | |
| tree | 2f48a45874bc32d63158f213fa63595239e54673 /src/lib/protocols/rtsp.c | |
| parent | 721031210b9318eaf643660748dcac61b9dd2a8a (diff) | |
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.
Diffstat (limited to 'src/lib/protocols/rtsp.c')
| -rw-r--r-- | src/lib/protocols/rtsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/protocols/rtsp.c b/src/lib/protocols/rtsp.c index 9d258f864..4a365650e 100644 --- a/src/lib/protocols/rtsp.c +++ b/src/lib/protocols/rtsp.c @@ -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) )) { |