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:
@@ -180,24 +180,67 @@
|
||||
#define NDPI_SOULSEEK_CONNECTION_IP_TICK_TIMEOUT 600
|
||||
|
||||
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
|
||||
#define NDPI_LOG(proto, m, log_level, args...) \
|
||||
#define NDPI_LOG(proto, m, log_level, args...) \
|
||||
{ \
|
||||
struct ndpi_detection_module_struct *mod = (struct ndpi_detection_module_struct*) m; \
|
||||
if(mod != NULL) { \
|
||||
mod->ndpi_debug_print_file=__FILE__; \
|
||||
mod->ndpi_debug_print_function=__FUNCTION__; \
|
||||
mod->ndpi_debug_print_line=__LINE__; \
|
||||
(*(mod->ndpi_debug_printf))(proto, mod, log_level, args); \
|
||||
} \
|
||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
||||
(*(mod->ndpi_debug_printf))(proto, mod, log_level, __FILE__, __FUNCTION__, __LINE__, args); \
|
||||
}
|
||||
#else /* NDPI_ENABLE_DEBUG_MESSAGES */
|
||||
#ifdef WIN32
|
||||
#define NDPI_LOG(...) {}
|
||||
#else
|
||||
#define NDPI_LOG(proto, mod, log_level, args...) {}
|
||||
#endif
|
||||
|
||||
/* We must define NDPI_CURRENT_PROTO before include ndpi_main.h !!!
|
||||
*
|
||||
* #include "ndpi_protocol_ids.h"
|
||||
* #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_XXXX
|
||||
* #include "ndpi_api.h"
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef NDPI_CURRENT_PROTO
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTO_UNKNOWN
|
||||
#endif
|
||||
|
||||
#define NDPI_LOG_ERR(mod, args...) \
|
||||
if(mod && mod->ndpi_log_level >= NDPI_LOG_ERROR) { \
|
||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
||||
(*(mod->ndpi_debug_printf))(NDPI_CURRENT_PROTO, mod, NDPI_LOG_ERROR , __FILE__, __FUNCTION__, __LINE__, args); \
|
||||
}
|
||||
|
||||
#define NDPI_LOG_INFO(mod, args...) \
|
||||
if(mod && mod->ndpi_log_level >= NDPI_LOG_TRACE) { \
|
||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
||||
(*(mod->ndpi_debug_printf))(NDPI_CURRENT_PROTO, mod, NDPI_LOG_TRACE , __FILE__, __FUNCTION__, __LINE__, args); \
|
||||
}
|
||||
|
||||
#define NDPI_LOG_DBG(mod, args...) \
|
||||
if(mod && mod->ndpi_log_level >= NDPI_LOG_DEBUG) { \
|
||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
||||
(*(mod->ndpi_debug_printf))(NDPI_CURRENT_PROTO, mod, NDPI_LOG_DEBUG , __FILE__, __FUNCTION__, __LINE__, args); \
|
||||
}
|
||||
|
||||
#define NDPI_LOG_DBG2(mod, args...) \
|
||||
if(mod && mod->ndpi_log_level >= NDPI_LOG_DEBUG_EXTRA) { \
|
||||
if(mod != NULL && mod->ndpi_debug_printf != NULL) \
|
||||
(*(mod->ndpi_debug_printf))(NDPI_CURRENT_PROTO, mod, NDPI_LOG_DEBUG_EXTRA , __FILE__, __FUNCTION__, __LINE__, args); \
|
||||
}
|
||||
|
||||
#else /* not defined NDPI_ENABLE_DEBUG_MESSAGES */
|
||||
# ifdef WIN32
|
||||
# define NDPI_LOG(...) {}
|
||||
# define NDPI_LOG_ERR(...) {}
|
||||
# define NDPI_LOG_INFO(...) {}
|
||||
# define NDPI_LOG_DBG(...) {}
|
||||
# define NDPI_LOG_DBG2(...) {}
|
||||
# else
|
||||
# define NDPI_LOG(proto, mod, log_level, args...) {}
|
||||
# define NDPI_LOG_ERR(mod, args...) {}
|
||||
# define NDPI_LOG_INFO(mod, args...) {}
|
||||
# define NDPI_LOG_DBG(mod, args...) {}
|
||||
# define NDPI_LOG_DBG2(mod, args...) {}
|
||||
# endif
|
||||
#endif /* NDPI_ENABLE_DEBUG_MESSAGES */
|
||||
|
||||
#define NDPI_EXCLUDE_PROTO(mod,flow) ndpi_exclude_protocol(mod, flow, NDPI_CURRENT_PROTO, __FILE__, __FUNCTION__, __LINE__)
|
||||
|
||||
/**
|
||||
* macro for getting the string len of a static string
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user