1 files changed, 11 insertions, 18 deletions

diff --git a/src/lib/protocols/memcached.c b/src/lib/protocols/memcached.c
index 0210a028a..9fc477bae 100644
--- a/src/lib/protocols/memcached.c
+++ b/src/lib/protocols/memcached.c
@@ -2,7 +2,7 @@
  * memcached.c
  *
  * Copyright (C) 2009-11 - ipoque GmbH
- * Copyright (C) 2011-22 - ntop.org
+ * Copyright (C) 2011-25 - ntop.org
  * Copyright (C) 2018 - eGloo Incorporated
  *
  * This file is part of nDPI, an open source deep packet inspection
@@ -112,21 +112,21 @@ static void ndpi_search_memcached(struct ndpi_detection_module_struct *ndpi_stru
 
   if (packet->tcp != NULL) {
     if (packet->payload_packet_len < MEMCACHED_MIN_LEN) {
-      NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+      NDPI_EXCLUDE_DISSECTOR(ndpi_struct, flow);
       return;
     }
 
     matches = &flow->l4.tcp.memcached_matches;
   }
-  else if (packet->udp != NULL) {
+  else {
     if (packet->payload_packet_len < MEMCACHED_MIN_UDP_LEN) {
-      NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+      NDPI_EXCLUDE_DISSECTOR(ndpi_struct, flow);
       return;
     }
 
     if ((offset[4] == 0x00 && offset[5] == 0x00) ||
 	offset[6] != 0x00 || offset[7] != 0x00) {
-      NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+      NDPI_EXCLUDE_DISSECTOR(ndpi_struct, flow);
       return;
     }
 
@@ -170,20 +170,13 @@ static void ndpi_search_memcached(struct ndpi_detection_module_struct *ndpi_stru
   if (*matches >= MEMCACHED_MIN_MATCH)
     ndpi_int_memcached_add_connection(ndpi_struct, flow);
   else if(flow->packet_counter > 5)
-    NDPI_EXCLUDE_PROTO(ndpi_struct, flow);    
+    NDPI_EXCLUDE_DISSECTOR(ndpi_struct, flow);    
 }
 
-void init_memcached_dissector(
-			      struct ndpi_detection_module_struct *ndpi_struct,
-			      u_int32_t *id)
+void init_memcached_dissector(struct ndpi_detection_module_struct *ndpi_struct)
 {
-  ndpi_set_bitmask_protocol_detection("MEMCACHED",
-				      ndpi_struct, *id,
-				      NDPI_PROTOCOL_MEMCACHED,
-				      ndpi_search_memcached,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
-				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-
-  *id += 1;
+  register_dissector("MEMCACHED", ndpi_struct,
+                     ndpi_search_memcached,
+                     NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
+                      1, NDPI_PROTOCOL_MEMCACHED);
 }