Merge branch 'config_gebug' of https://github.com/vel21ripn/nDPI into vel21ripn-config_gebug

This commit is contained in:
Campus
2018-02-16 22:18:43 +01:00
5 changed files with 15 additions and 4 deletions
+4
View File
@@ -109,6 +109,10 @@ AS_IF([test "x$enable_json_c" != "xno"], [
])
])
AC_ARG_ENABLE([debug-messages],
AS_HELP_STRING([--enable-debug-messages], [Define NDPI_ENABLE_DEBUG_MESSAGES=1]), [
AC_DEFINE(NDPI_ENABLE_DEBUG_MESSAGES, 1, [Enable ndpi_debug_messages]) ])
AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np]))
AC_CONFIG_FILES([Makefile src/lib/Makefile example/Makefile tests/Makefile libndpi.pc src/include/ndpi_define.h])
+1
View File
@@ -24,6 +24,7 @@
#ifndef __NDPI_MAIN_H__
#define __NDPI_MAIN_H__
#include "ndpi_config.h"
#include "ndpi_includes.h"
#include "ndpi_define.h"
#include "ndpi_protocol_ids.h"
Executable → Regular
+6 -2
View File
@@ -21,11 +21,15 @@
*
*
*/
#include "ndpi_protocols.h"
#include "ndpi_protocol_ids.h"
#ifdef NDPI_PROTOCOL_CHECKMK
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CHECKMK
#include "ndpi_api.h"
static void ndpi_int_checkmk_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
+3 -1
View File
@@ -23,10 +23,12 @@
*/
#include "ndpi_protocols.h"
#include "ndpi_protocol_ids.h"
#if defined(NDPI_PROTOCOL_IP_IPSEC) || defined(NDPI_PROTOCOL_IP_GRE) || defined(NDPI_PROTOCOL_IP_ICMP) || defined(NDPI_PROTOCOL_IP_IGMP) || defined(NDPI_PROTOCOL_IP_EGP) || defined(NDPI_PROTOCOL_IP_SCTP) || defined(NDPI_PROTOCOL_IP_OSPF) || defined(NDPI_PROTOCOL_IP_IP_IN_IP)
#include "ndpi_api.h"
#define set_protocol_and_bmask(nprot) \
{ \
if (NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask,nprot) != 0) \
+1 -1
View File
@@ -28,7 +28,7 @@
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_OPENFT
#include "ndpi_protocols.h"
#include "ndpi_api.h"
static void ndpi_int_openft_add_connection(struct ndpi_detection_module_struct
*ndpi_struct, struct ndpi_flow_struct *flow)