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, 37 insertions, 37 deletions

diff --git a/src/lib/protocols/aimini.c b/src/lib/protocols/aimini.c
index 147762815..fb439f817 100644
--- a/src/lib/protocols/aimini.c
+++ b/src/lib/protocols/aimini.c
@@ -23,10 +23,14 @@
  */
 
 
-#include "ndpi_protocols.h"
+#include "ndpi_protocol_ids.h"
 
 #ifdef NDPI_PROTOCOL_AIMINI
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AIMINI
+
+#include "ndpi_api.h"
+
 
 static void ndpi_int_aimini_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow/* ,  */
 					   /* ndpi_protocol_type_t protocol_type */)
@@ -50,43 +54,40 @@ static u_int8_t is_special_aimini_host(struct ndpi_int_one_line_struct host_line
 void ndpi_search_aimini(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;
-
 
-	NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "search aimini.\n");
+	NDPI_LOG_DBG(ndpi_struct, "search aimini\n");
 
 	if (packet->udp != NULL) {
 		if (flow->l4.udp.aimini_stage == 0) {
 			if (packet->payload_packet_len == 64 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010b) {
 				flow->l4.udp.aimini_stage = 1;
-				NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 1.\n");
+				NDPI_LOG_DBG2(ndpi_struct, "stage = 1\n");
 				return;
 			}
 			if (packet->payload_packet_len == 136
 				&& (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165)) {
 				flow->l4.udp.aimini_stage = 4;
-				NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 4.\n");
+				NDPI_LOG_DBG2(ndpi_struct, "stage = 4\n");
 				return;
 			}
 			if (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101) {
 				flow->l4.udp.aimini_stage = 7;
-				NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 7.\n");
+				NDPI_LOG_DBG2(ndpi_struct, "stage = 7\n");
 				return;
 			}
 			if (packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) {
 				flow->l4.udp.aimini_stage = 10;
-				NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 10.\n");
+				NDPI_LOG_DBG2(ndpi_struct, "stage = 10\n");
 				return;
 			}
 			if (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) {
 				flow->l4.udp.aimini_stage = 13;
-				NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 13.\n");
+				NDPI_LOG_DBG2(ndpi_struct, "stage = 13\n");
 				return;
 			}
 			if (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) {
 				flow->l4.udp.aimini_stage = 16;
-				NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 16.\n");
+				NDPI_LOG_DBG2(ndpi_struct, "stage = 16\n");
 				return;
 			}
 		}
@@ -96,7 +97,7 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 		if (flow->l4.udp.aimini_stage == 1 && packet->payload_packet_len > 100
 			&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0115) {
 			flow->l4.udp.aimini_stage = 2;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 2.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 2\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 2 &&
@@ -104,14 +105,14 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 			 (packet->payload_packet_len == 64 && get_u_int16_t(packet->payload, 0) == htons(0x010b)) ||
 			 (packet->payload_packet_len == 88 && get_u_int16_t(packet->payload, 0) == ntohs(0x0115)))) {
 			flow->l4.udp.aimini_stage = 3;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 3.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 3\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 3
 			&& ((packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)
 				|| (packet->payload_packet_len == 64 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010b)
 				|| (packet->payload_packet_len > 100 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0115))) {
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "found aimini (64, 0x010b), (>300, 0x0115), "
+			NDPI_LOG_INFO(ndpi_struct, "found aimini (64, 0x010b), (>300, 0x0115), "
 					"(16, 0x010c || 64, 0x010b), (16, 0x010c || 64, 0x010b || >100, 0x0115).\n");
 			ndpi_int_aimini_add_connection(ndpi_struct, flow);
 			return;
@@ -122,14 +123,14 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 		if (flow->l4.udp.aimini_stage == 4 && packet->payload_packet_len == 136
 			&& (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165)) {
 			flow->l4.udp.aimini_stage = 5;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 5.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 5\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 5 && (packet->payload_packet_len == 136
 											   && (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9
 												   || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165))) {
 			flow->l4.udp.aimini_stage = 6;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 6.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 6\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 6 && ((packet->payload_packet_len == 136
@@ -137,7 +138,7 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 													|| ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9))
 											   || (packet->payload_packet_len == 32
 												   && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
+			NDPI_LOG_INFO(ndpi_struct,
 					"found aimini (136, 0x01c9), (136, 0x01c9)," "(136, 0x01c9),(136, 0x01c9 || 32, 0x01ca).\n");
 			ndpi_int_aimini_add_connection(ndpi_struct, flow);
 			return;
@@ -148,18 +149,18 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 		if (flow->l4.udp.aimini_stage == 7 && packet->payload_packet_len == 88
 			&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101) {
 			flow->l4.udp.aimini_stage = 8;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 8.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 8\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 8
 			&& (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101)) {
 			flow->l4.udp.aimini_stage = 9;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 9.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 9\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 9
 			&& (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101)) {
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
+			NDPI_LOG_INFO(ndpi_struct,
 					"found aimini (88, 0x0101), (88, 0x0101)," "(88, 0x0101),(88, 0x0101).\n");
 			ndpi_int_aimini_add_connection(ndpi_struct, flow);
 			return;
@@ -170,19 +171,19 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 		if (flow->l4.udp.aimini_stage == 10 && packet->payload_packet_len == 104
 			&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) {
 			flow->l4.udp.aimini_stage = 11;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 11.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 11\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 11
 			&& (packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102)) {
 			flow->l4.udp.aimini_stage = 12;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 12.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 12\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 12
 			&& ((packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102)
 				|| (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
+			NDPI_LOG_INFO(ndpi_struct,
 					"found aimini (104, 0x0102), (104, 0x0102), " "(104, 0x0102), (104, 0x0102).\n");
 			ndpi_int_aimini_add_connection(ndpi_struct, flow);
 			return;
@@ -193,20 +194,20 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 		if (flow->l4.udp.aimini_stage == 13 && packet->payload_packet_len == 32
 			&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) {
 			flow->l4.udp.aimini_stage = 14;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 14.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 14\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 14
 			&& ((packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca)
 				|| (packet->payload_packet_len == 136 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0166))) {
 			flow->l4.udp.aimini_stage = 15;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 15.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 15\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 15
 			&& ((packet->payload_packet_len == 136 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0166)
 				|| (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) {
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
+			NDPI_LOG_INFO(ndpi_struct,
 					"found aimini (32,0x01ca), (32,0x01ca), (32,0x01ca), ((136, 0x0166)||(32,0x01ca)).\n");
 			ndpi_int_aimini_add_connection(ndpi_struct, flow);
 			return;
@@ -217,18 +218,18 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 		if (flow->l4.udp.aimini_stage == 16 && packet->payload_packet_len == 16
 			&& ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) {
 			flow->l4.udp.aimini_stage = 17;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 17.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 17\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 17
 			&& (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)) {
 			flow->l4.udp.aimini_stage = 18;
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "stage = 18.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "stage = 18\n");
 			return;
 		}
 		if (flow->l4.udp.aimini_stage == 18
 			&& (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)) {
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
+			NDPI_LOG_INFO(ndpi_struct,
 					"found aimini (16, 0x010c), (16, 0x010c), (16, 0x010c), (16, 0x010c).\n");
 			ndpi_int_aimini_add_connection(ndpi_struct, flow);
 			return;
@@ -238,11 +239,11 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 			 (memcmp(packet->payload, "GET /player/", NDPI_STATICSTRING_LEN("GET /player/")) == 0)) ||
 			(packet->payload_packet_len > NDPI_STATICSTRING_LEN("GET /play/?fid=") &&
 			 (memcmp(packet->payload, "GET /play/?fid=", NDPI_STATICSTRING_LEN("GET /play/?fid=")) == 0))) {
-			NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "HTTP packet detected.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "HTTP packet detected\n");
 			ndpi_parse_packet_line_info(ndpi_struct, flow);
 			if (packet->host_line.ptr != NULL && packet->host_line.len > 11
 				&& (memcmp(&packet->host_line.ptr[packet->host_line.len - 11], ".aimini.net", 11) == 0)) {
-				NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "AIMINI HTTP traffic detected.\n");
+				NDPI_LOG_INFO(ndpi_struct, "found AIMINI HTTP traffic\n");
 				ndpi_int_aimini_add_connection(ndpi_struct, flow);
 				return;
 			}
@@ -255,8 +256,8 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 						   NDPI_STATICSTRING_LEN("download/")) == 0) {
 					ndpi_parse_packet_line_info(ndpi_struct, flow);
 					if (is_special_aimini_host(packet->host_line) == 1) {
-						NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
-								"AIMINI HTTP traffic detected.\n");
+						NDPI_LOG_INFO(ndpi_struct,
+								"found AIMINI HTTP traffic\n");
 						ndpi_int_aimini_add_connection(ndpi_struct, flow);
 						return;
 					}
@@ -266,8 +267,8 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 						   NDPI_STATICSTRING_LEN("upload/")) == 0) {
 					ndpi_parse_packet_line_info(ndpi_struct, flow);
 					if (is_special_aimini_host(packet->host_line) == 1) {
-						NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG,
-								"AIMINI HTTP traffic detected.\n");
+						NDPI_LOG_INFO(ndpi_struct,
+								"found AIMINI HTTP traffic detected.\n");
 						ndpi_int_aimini_add_connection(ndpi_struct, flow);
 						return;
 					}
@@ -276,8 +277,7 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 		}
 	}
 
-	NDPI_LOG(NDPI_PROTOCOL_AIMINI, ndpi_struct, NDPI_LOG_DEBUG, "exclude aimini.\n");
-	NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_AIMINI);
+	NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 
 }