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, 18 insertions, 17 deletions

diff --git a/src/lib/protocols/ipp.c b/src/lib/protocols/ipp.c
index 2135f297f..fcf25a758 100644
--- a/src/lib/protocols/ipp.c
+++ b/src/lib/protocols/ipp.c
@@ -22,11 +22,15 @@
  * 
  */
 
-
-#include "ndpi_protocols.h"
+#include "ndpi_protocol_ids.h"
 
 #ifdef NDPI_PROTOCOL_IPP
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_IPP
+
+#include "ndpi_api.h"
+
+
 static void ndpi_int_ipp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
 					struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
 {
@@ -36,22 +40,20 @@ static void ndpi_int_ipp_add_connection(struct ndpi_detection_module_struct *ndp
 void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
 	struct ndpi_packet_struct *packet = &flow->packet;	
-//      struct ndpi_id_struct         *src=ndpi_struct->src;
-//      struct ndpi_id_struct         *dst=ndpi_struct->dst;
-
 	u_int8_t i;
 
-	NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "search ipp\n");
+	NDPI_LOG_DBG(ndpi_struct, "search ipp\n");
+
 	if (packet->payload_packet_len > 20) {
 
-		NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG,
+		NDPI_LOG_DBG2(ndpi_struct,
 				"searching for a payload with a pattern like 'number(1to8)blanknumber(1to3)ipp://.\n");
 		/* this pattern means that there is a printer saying that his state is idle,
 		 * means that he is not printing anything at the moment */
 		i = 0;
 
 		if (packet->payload[i] < '0' || packet->payload[i] > '9') {
-			NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "payload does not begin with a number.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "payload does not begin with a number\n");
 			goto search_for_next_pattern;
 		}
 
@@ -60,37 +62,37 @@ void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 			if (!((packet->payload[i] >= '0' && packet->payload[i] <= '9') ||
 				  (packet->payload[i] >= 'a' && packet->payload[i] <= 'f') ||
 				  (packet->payload[i] >= 'A' && packet->payload[i] <= 'F')) || i > 8) {
-				NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG,
+				NDPI_LOG_DBG2(ndpi_struct,
 						"read symbols while the symbol is a number.\n");
 				break;
 			}
 		}
 
 		if (packet->payload[i++] != ' ') {
-			NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "there is no blank following the number.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "there is no blank following the number\n");
 			goto search_for_next_pattern;
 		}
 
 		if (packet->payload[i] < '0' || packet->payload[i] > '9') {
-			NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "no number following the blank.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "no number following the blank\n");
 			goto search_for_next_pattern;
 		}
 
 		for (;;) {
 			i++;
 			if (packet->payload[i] < '0' || packet->payload[i] > '9' || i > 12) {
-				NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG,
+				NDPI_LOG_DBG2(ndpi_struct,
 						"read symbols while the symbol is a number.\n");
 				break;
 			}
 		}
 
 		if (memcmp(&packet->payload[i], " ipp://", 7) != 0) {
-			NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "the string ' ipp://' does not follow.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "the string ' ipp://' does not follow\n");
 			goto search_for_next_pattern;
 		}
 
-		NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "found ipp\n");
+		NDPI_LOG_INFO(ndpi_struct, "found ipp\n");
 		ndpi_int_ipp_add_connection(ndpi_struct, flow);
 		return;
 	}
@@ -101,13 +103,12 @@ void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 		ndpi_parse_packet_line_info(ndpi_struct, flow);
 		if (packet->content_line.ptr != NULL && packet->content_line.len > 14
 			&& memcmp(packet->content_line.ptr, "application/ipp", 15) == 0) {
-			NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "found ipp via POST ... application/ipp.\n");
+			NDPI_LOG_INFO(ndpi_struct, "found ipp via POST ... application/ipp\n");
 			ndpi_int_ipp_add_connection(ndpi_struct, flow);
 			return;
 		}
 	}
-	NDPI_LOG(NDPI_PROTOCOL_IPP, ndpi_struct, NDPI_LOG_DEBUG, "no ipp detected.\n");
-	NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_IPP);
+	NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }