diff options
| author | Campus <campus@ntop.org> | 2016-11-03 23:10:23 +0100 |
|---|---|---|
| committer | Campus <campus@ntop.org> | 2016-11-03 23:10:23 +0100 |
| commit | 7758bc821eceecd98ab08ed5cb4a73ac2e30e34e (patch) | |
| tree | fe5620d3c962f9b1a2cff692b5f2bd3e65009e27 /src/include/ndpi_define.h | |
| parent | 58e97c966c3aef178580d8f362df95274fbe9c8a (diff) | |
| parent | 78f7f1935973160c668327e41af2b59cafade874 (diff) | |
Merge branch 'vpiserchia-dev' into dev
Diffstat (limited to 'src/include/ndpi_define.h')
| -rw-r--r-- | src/include/ndpi_define.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/include/ndpi_define.h b/src/include/ndpi_define.h index ce6149e5e..b632712a1 100644 --- a/src/include/ndpi_define.h +++ b/src/include/ndpi_define.h @@ -180,29 +180,22 @@ #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__; \ - if (mod->ndpi_debug_printf != NULL) \ - mod->ndpi_debug_printf(proto, mod, log_level, args); \ - else \ - printf(args, proto, mod, log_level); \ - } \ + 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); \ + } \ } - #else /* NDPI_ENABLE_DEBUG_MESSAGES */ - #ifdef WIN32 #define NDPI_LOG(...) {} #else #define NDPI_LOG(proto, mod, log_level, args...) {} #endif - #endif /* NDPI_ENABLE_DEBUG_MESSAGES */ /** |