Refactoring the debugging output.

levels of debug output:
 0 - ERROR: Only for errors.
 1 - TRACE: Start of each packets and if found protocol.
 2 - DEBUG: Start of searching each protocol and excluding protocols.
 3 - DEBUG_EXTRA: For all other messages.

Added field ndpi_struct->debug_logging for enable debug output of each protocols.

Simple macros for debugging output are added:
NDPI_LOG_ERR(), NDPI_LOG_INFO(), NDPI_LOG_DBG(), NDPI_LOG_DBG2(),
NDPI_EXCLUDE_PROTO()

1 files changed, 20 insertions, 20 deletions

diff --git a/src/lib/protocols/ntp.c b/src/lib/protocols/ntp.c
index 6e355c9f8..3b8eb3d7d 100644
--- a/src/lib/protocols/ntp.c
+++ b/src/lib/protocols/ntp.c
@@ -22,10 +22,13 @@
  * 
  */
 
-#include "ndpi_protocols.h"
+#include "ndpi_protocol_ids.h"
 
 #ifdef NDPI_PROTOCOL_NTP
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_NTP
+
+#include "ndpi_api.h"
 
 static void ndpi_int_ntp_add_connection(struct ndpi_detection_module_struct
 					*ndpi_struct, struct ndpi_flow_struct *flow)
@@ -37,31 +40,28 @@ void ndpi_search_ntp_udp(struct ndpi_detection_module_struct *ndpi_struct, struc
 {
   struct ndpi_packet_struct *packet = &flow->packet;
   
-  if (!(packet->udp->dest == htons(123) || packet->udp->source == htons(123)))
-    goto exclude_ntp;
-  
-  NDPI_LOG(NDPI_PROTOCOL_NTP, ndpi_struct, NDPI_LOG_DEBUG, "NTP port detected\n");
-  
-  NDPI_LOG(NDPI_PROTOCOL_NTP, ndpi_struct, NDPI_LOG_DEBUG, "NTP length detected\n");
+  NDPI_LOG_DBG(ndpi_struct, "search NTP\n");
+
+  if (packet->udp->dest == htons(123) || packet->udp->source == htons(123)) {
   
+    NDPI_LOG_DBG2(ndpi_struct, "NTP port and length detected\n");
   
-  if ((((packet->payload[0] & 0x38) >> 3) <= 4)) {
-    NDPI_LOG(NDPI_PROTOCOL_NTP, ndpi_struct, NDPI_LOG_DEBUG, "detected NTP.");
+    if ((((packet->payload[0] & 0x38) >> 3) <= 4)) {
     
-    // 38 in binary representation is 00111000 
-    flow->protos.ntp.version = (packet->payload[0] & 0x38) >> 3;
+      // 38 in binary representation is 00111000 
+      flow->protos.ntp.version = (packet->payload[0] & 0x38) >> 3;
     
-    if (flow->protos.ntp.version == 2) {
-      flow->protos.ntp.request_code = packet->payload[3];
-    }
+      if (flow->protos.ntp.version == 2) {
+        flow->protos.ntp.request_code = packet->payload[3];
+      }
     
-    ndpi_int_ntp_add_connection(ndpi_struct, flow);
-    return;
+      NDPI_LOG_INFO(ndpi_struct, "found NTP\n");
+      ndpi_int_ntp_add_connection(ndpi_struct, flow);
+      return;
+    }
   }
-  
- exclude_ntp:
-	NDPI_LOG(NDPI_PROTOCOL_NTP, ndpi_struct, NDPI_LOG_DEBUG, "NTP excluded.\n");
-	NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_NTP);
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+
 }