aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCampus <campus@ntop.org>2018-02-16 22:18:43 +0100
committerCampus <campus@ntop.org>2018-02-16 22:18:43 +0100
commit029ca0797a3de641d8f57bed6da85e693186dbe8 (patch)
treeb763e7fa1f882ca973e9e24f6f505fa97a710046 /src/lib
parenta5dd00eedb1ab666833f6bd4e6094b73b3333436 (diff)
parent0624afd422b7fbdd2b481a299ac9bf62fa9ec706 (diff)
Merge branch 'config_gebug' of https://github.com/vel21ripn/nDPI into vel21ripn-config_gebug
Diffstat (limited to 'src/lib')
-rw-r--r--[-rwxr-xr-x]src/lib/protocols/checkmk.c8
-rw-r--r--src/lib/protocols/non_tcp_udp.c4
-rw-r--r--src/lib/protocols/openft.c2
3 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/protocols/checkmk.c b/src/lib/protocols/checkmk.c
index 50a92c8d5..81ac543b6 100755..100644
--- a/src/lib/protocols/checkmk.c
+++ b/src/lib/protocols/checkmk.c
@@ -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)
{
diff --git a/src/lib/protocols/non_tcp_udp.c b/src/lib/protocols/non_tcp_udp.c
index fa3163e74..a2e0d81f5 100644
--- a/src/lib/protocols/non_tcp_udp.c
+++ b/src/lib/protocols/non_tcp_udp.c
@@ -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) \
diff --git a/src/lib/protocols/openft.c b/src/lib/protocols/openft.c
index 4a86a067f..d0b50c8a2 100644
--- a/src/lib/protocols/openft.c
+++ b/src/lib/protocols/openft.c
@@ -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)