From 39ae57e6a3d93cb91def5d76fc54e89075f01867 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Fri, 8 May 2020 18:24:07 +0200 Subject: Cleaned hyperscan leftover Added further hyperscan hooks --- src/include/ndpi_typedefs.h | 4 +++- src/lib/ndpi_main.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index ca1da4ff2..ef3da7cc5 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1099,7 +1099,9 @@ struct ndpi_detection_module_struct { u_int8_t direction_detect_disable:1, /* disable internal detection of packet direction */ _pad:7; - void *hyperscan; /* Intel Hyperscan */ +#ifdef CUSTOM_NDPI_PROTOCOLS + #include "../../../nDPI-custom/custom_ndpi_typedefs.h" +#endif }; #endif /* NDPI_LIB_COMPILATION */ diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index db5e14778..6e2c30006 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2305,6 +2305,10 @@ void ndpi_exit_detection_module(struct ndpi_detection_module_struct *ndpi_str) { if(ndpi_str->custom_categories.ipAddresses_shadow != NULL) ndpi_Destroy_Patricia((patricia_tree_t *) ndpi_str->custom_categories.ipAddresses_shadow, free_ptree_data); +#ifdef CUSTOM_NDPI_PROTOCOLS +#include "../../../nDPI-custom/ndpi_exit_detection_module.c" +#endif + ndpi_free(ndpi_str); } } -- cgit v1.2.3