1 files changed, 12 insertions, 17 deletions

diff --git a/src/lib/protocols/ldap.c b/src/lib/protocols/ldap.c
index fee99a92d..4adb7c471 100644
--- a/src/lib/protocols/ldap.c
+++ b/src/lib/protocols/ldap.c
@@ -22,11 +22,15 @@
  * 
  */
 
-
-#include "ndpi_protocols.h"
+#include "ndpi_protocol_ids.h"
 
 #ifdef NDPI_PROTOCOL_LDAP
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_LDAP
+
+#include "ndpi_api.h"
+
+
 static void ndpi_int_ldap_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
 					 struct ndpi_flow_struct *flow)
 {
@@ -37,15 +41,7 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
 {
 	struct ndpi_packet_struct *packet = &flow->packet;
 	
-//      struct ndpi_id_struct         *src=ndpi_struct->src;
-//      struct ndpi_id_struct         *dst=ndpi_struct->dst;
-
-//  u_int16_t dport;
-
-
-
-	NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "search ldap\n");
-
+	NDPI_LOG_DBG(ndpi_struct, "search ldap\n");
 
 	if (packet->payload_packet_len >= 14 && packet->payload[0] == 0x30) {
 
@@ -55,14 +51,14 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 			if (packet->payload[3] == 0x01 &&
 				(packet->payload[5] == 0x60 || packet->payload[5] == 0x61) && packet->payload[6] == 0x07) {
-				NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "found ldap simple type 1\n");
+				NDPI_LOG_INFO(ndpi_struct, "found ldap simple type 1\n");
 				ndpi_int_ldap_add_connection(ndpi_struct, flow);
 				return;
 			}
 
 			if (packet->payload[3] == 0x02 &&
 				(packet->payload[6] == 0x60 || packet->payload[6] == 0x61) && packet->payload[7] == 0x07) {
-				NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "found ldap simple type 2\n");
+				NDPI_LOG_INFO(ndpi_struct, "found ldap simple type 2\n");
 				ndpi_int_ldap_add_connection(ndpi_struct, flow);
 				return;
 			}
@@ -75,7 +71,7 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
 				(packet->payload[9] == 0x60 || packet->payload[9] == 0x61 || packet->payload[9] == 0x63 ||
 				 packet->payload[9] == 0x64) && packet->payload[10] == 0x84) {
 
-				NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "found ldap type 1\n");
+				NDPI_LOG_INFO(ndpi_struct, "found ldap type 1\n");
 				ndpi_int_ldap_add_connection(ndpi_struct, flow);
 				return;
 			}
@@ -84,7 +80,7 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
 				(packet->payload[10] == 0x60 || packet->payload[10] == 0x61 || packet->payload[10] == 0x63 ||
 				 packet->payload[10] == 0x64) && packet->payload[11] == 0x84) {
 
-				NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "found ldap type 2\n");
+				NDPI_LOG_INFO(ndpi_struct, "found ldap type 2\n");
 				ndpi_int_ldap_add_connection(ndpi_struct, flow);
 				return;
 			}
@@ -92,8 +88,7 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
 	}
 
 
-	NDPI_LOG(NDPI_PROTOCOL_LDAP, ndpi_struct, NDPI_LOG_DEBUG, "ldap excluded.\n");
-	NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_LDAP);
+	NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }