From 88425e0199dc85f95b05ffb244c6ecc048dab853 Mon Sep 17 00:00:00 2001
From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com>
Date: Mon, 26 Jun 2023 12:05:16 +0200
Subject: Simplify the report of streaming multimedia info (#2026)

The two fields `flow->flow_type` and `flow->protos.rtp.stream_type` are
pretty much identical: rename the former in `flow->flow_multimedia_type`
and remove the latter.
---
 src/include/ndpi_typedefs.h | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/include')

diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index 98e17cb15..7f6e34b2c 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -1363,14 +1363,6 @@ struct ndpi_risk_information {
   char *info;  
 };
 
-enum ndpi_rtp_stream_type {
-  rtp_unknown = 0,
-  rtp_audio,
-  rtp_video,  
-  rtp_audio_video,
-  rtp_screen_share
-};
-
 struct ndpi_flow_struct {
   u_int16_t detected_protocol_stack[NDPI_PROTOCOL_SIZE];
 
@@ -1453,7 +1445,7 @@ struct ndpi_flow_struct {
     char *nat_ip; /* Via HTTP X-Forwarded-For */
   } http;
 
-  ndpi_multimedia_flow_type flow_type;
+  ndpi_multimedia_flow_type flow_multimedia_type;
 
   /*
      Put outside of the union to avoid issues in case the protocol
@@ -1484,10 +1476,6 @@ struct ndpi_flow_struct {
       char ptr_domain_name[64 /* large enough but smaller than { } tls */];
     } dns;
 
-    struct {
-      enum ndpi_rtp_stream_type stream_type;
-    } rtp;
-    
     struct {
       u_int8_t request_code;
       u_int8_t version;
-- 
cgit v1.2.3