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()
This commit is contained in:
Vitaly Lavrov
2017-10-26 20:41:22 +03:00
parent 4f72b954da
commit 2787c2390c
153 changed files with 2680 additions and 2492 deletions
+8 -10
View File
@@ -22,13 +22,14 @@
*
*/
#include "ndpi_protocol_ids.h"
/* include files */
#include "ndpi_protocols.h"
#ifdef NDPI_PROTOCOL_PPTP
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_PPTP
#include "ndpi_api.h"
static void ndpi_int_pptp_add_connection(struct ndpi_detection_module_struct
*ndpi_struct, struct ndpi_flow_struct *flow)
{
@@ -40,9 +41,7 @@ void ndpi_search_pptp(struct ndpi_detection_module_struct
{
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_DBG(ndpi_struct, "search pptp\n");
if (packet->payload_packet_len >= 10 && get_u_int16_t(packet->payload, 0) == htons(packet->payload_packet_len)
&& get_u_int16_t(packet->payload, 2) == htons(0x0001) /* message type: control message */
@@ -50,13 +49,12 @@ void ndpi_search_pptp(struct ndpi_detection_module_struct
&&(get_u_int16_t(packet->payload, 8) == htons(0x0001) /* control type: start-control-connection-request */
)) {
NDPI_LOG(NDPI_PROTOCOL_PPTP, ndpi_struct, NDPI_LOG_DEBUG, "found pptp.\n");
NDPI_LOG_INFO(ndpi_struct, "found pptp\n");
ndpi_int_pptp_add_connection(ndpi_struct, flow);
return;
}
NDPI_LOG(NDPI_PROTOCOL_PPTP, ndpi_struct, NDPI_LOG_DEBUG, "exclude pptp.\n");
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_PPTP);
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
}