From 78f4b60efef27b358b160252b157482d71dbf430 Mon Sep 17 00:00:00 2001
From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com>
Date: Sat, 24 May 2025 13:17:46 +0200
Subject: A new interface for dissectors registration (#2843)

We use `registr_dissector()` instead of
`ndpi_set_bitmask_protocol_detection()`.

Every file in `src/lib/protocols/*.c` is a dissector.

Every dissector can handle multiple protocols.

The real goal is this small change:
```
 struct call_function_struct {
-  NDPI_PROTOCOL_BITMASK detection_bitmask;
```
i.e. getting rid of another protocol bitmask: this is mandatory to try
to fix #2136 (see also e845e8205b68752c997d05224d8b2fd45acde714)

As a nice side effect, we remove a bitmask comparison in the hot function
`check_ndpi_detection_func()`

TODO: change logging configuration from per-protocol to per-dissector
---
 src/lib/protocols/line.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/lib/protocols/line.c')

diff --git a/src/lib/protocols/line.c b/src/lib/protocols/line.c
index d0bb89825..232d629e0 100644
--- a/src/lib/protocols/line.c
+++ b/src/lib/protocols/line.c
@@ -98,7 +98,7 @@ static void ndpi_search_line(struct ndpi_detection_module_struct *ndpi_struct,
             if(flow->l4.udp.line_base_cnt[0] != flow->l4.udp.line_base_cnt[1])
               ndpi_int_line_add_connection(ndpi_struct, flow);
             else
-              NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+              NDPI_EXCLUDE_DISSECTOR(ndpi_struct, flow);
 	  }
           return;
         }
@@ -106,16 +106,14 @@ static void ndpi_search_line(struct ndpi_detection_module_struct *ndpi_struct,
     }
   }
 
-  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+  NDPI_EXCLUDE_DISSECTOR(ndpi_struct, flow);
   return;
 }
 
 void init_line_dissector(struct ndpi_detection_module_struct *ndpi_struct)
 {
-  ndpi_set_bitmask_protocol_detection("LineCall", ndpi_struct,
-				      NDPI_PROTOCOL_LINE_CALL,
-				      ndpi_search_line,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
-				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
+  register_dissector("LineCall", ndpi_struct,
+                     ndpi_search_line,
+                     NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
+                      1, NDPI_PROTOCOL_LINE_CALL);
 }
-- 
cgit v1.2.3