Added nDPId-test as all-in-one JSON dumper.

 * fixed invalid flow event schema type
 * added run_tests.sh to generate/diff JSON dumps
 * renamed lot's of vars/fns in nDPId.c/nDPIsrvd.c, so nDPId-test.c can include "*.c"
 * improved CMake dependency checks

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 46 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efd10b58e..c07e2b742 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,11 +12,14 @@ set(STATIC_LIBNDPI_INSTALLDIR "" CACHE STRING "Path to a installation directory
 
 add_executable(nDPId nDPId.c utils.c)
 add_executable(nDPIsrvd nDPIsrvd.c utils.c)
+add_executable(nDPId-test nDPId-test.c utils.c)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -DJSMN_STATIC=1 -DJSMN_STRICT=1")
 
 if(ENABLE_MEMORY_PROFILING)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_MEMORY_PROFILING=1 -Duthash_malloc=nDPIsrvd_uthash_malloc -Duthash_free=nDPIsrvd_uthash_free")
+    set(MEMORY_PROFILING_CFLAGS "-DENABLE_MEMORY_PROFILING=1" "-Duthash_malloc=nDPIsrvd_uthash_malloc" "-Duthash_free=nDPIsrvd_uthash_free")
+else()
+    set(MEMORY_PROFILING_CFLAGS "")
 endif()
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -45,56 +48,83 @@ if(NOT STATIC_LIBNDPI_INSTALLDIR STREQUAL "")
     endif()
 
     if(NDPI_WITH_PCRE)
-        pkg_check_modules(PCRE REQUIRED libpcre)
+        pkg_check_modules(PCRE REQUIRED libpcre>=8.39)
     endif()
     if(NDPI_WITH_MAXMINDDB)
-        pkg_check_modules(MAXMINDDB REQUIRED libmaxminddb)
+        pkg_check_modules(MAXMINDDB REQUIRED libmaxminddb>=1.3.2)
     endif()
 
-    find_package(PCAP "1.8.1" REQUIRED)
-    target_compile_options(nDPId PRIVATE "-pthread")
-    target_include_directories(nDPId PRIVATE "${STATIC_LIBNDPI_INSTALLDIR}/include/ndpi")
-    target_link_libraries(nDPId "${STATIC_LIBNDPI_INSTALLDIR}/lib/libndpi.a"
-                                "${GCRYPT_LIBRARY}" "${PCAP_LIBRARY}"
-                                "${pkgcfg_lib_MAXMINDDB_maxminddb}" "-pthread")
-    target_include_directories(nDPIsrvd PRIVATE
-                               "${CMAKE_SOURCE_DIR}"
-                               "${CMAKE_SOURCE_DIR}/dependencies"
-                               "${CMAKE_SOURCE_DIR}/dependencies/jsmn"
-                               "${CMAKE_SOURCE_DIR}/dependencies/uthash/src")
+    set(STATIC_LIBNDPI_INC "${STATIC_LIBNDPI_INSTALLDIR}/include/ndpi")
+    set(STATIC_LIBNDPI_LIB "${STATIC_LIBNDPI_INSTALLDIR}/lib/libndpi.a")
 else()
-    pkg_check_modules(NDPI "3.6.0" REQUIRED)
+    pkg_check_modules(NDPI REQUIRED libndpi>=3.6.0)
+    set(STATIC_LIBNDPI_INC "")
+    set(STATIC_LIBNDPI_LIB "")
 endif()
 
+find_package(PCAP "1.8.1" REQUIRED)
+target_compile_options(nDPId PRIVATE ${MEMORY_PROFILING_CFLAGS} "-pthread")
+target_include_directories(nDPId PRIVATE "${STATIC_LIBNDPI_INC}")
+target_link_libraries(nDPId "${STATIC_LIBNDPI_LIB}"
+                            "${GCRYPT_LIBRARY}" "${PCAP_LIBRARY}"
+                            "${pkgcfg_lib_MAXMINDDB_maxminddb}" "-pthread")
+
+target_compile_options(nDPId PRIVATE ${MEMORY_PROFILING_CFLAGS})
+target_include_directories(nDPIsrvd PRIVATE
+                           "${CMAKE_SOURCE_DIR}"
+                           "${CMAKE_SOURCE_DIR}/dependencies"
+                           "${CMAKE_SOURCE_DIR}/dependencies/jsmn"
+                           "${CMAKE_SOURCE_DIR}/dependencies/uthash/src")
+
+target_include_directories(nDPId-test PRIVATE
+                           "${CMAKE_SOURCE_DIR}"
+                           "${CMAKE_SOURCE_DIR}/dependencies"
+                           "${CMAKE_SOURCE_DIR}/dependencies/jsmn"
+                           "${CMAKE_SOURCE_DIR}/dependencies/uthash/src")
+target_compile_options(nDPId-test PRIVATE "-Wno-unused-function" "-pthread")
+target_include_directories(nDPId-test PRIVATE "${STATIC_LIBNDPI_INC}")
+target_compile_definitions(nDPId-test PRIVATE "-D_GNU_SOURCE=1" "-DNO_MAIN=1" "-Dsyslog=mock_syslog_stderr")
+target_link_libraries(nDPId-test "${STATIC_LIBNDPI_LIB}"
+                                 "${GCRYPT_LIBRARY}" "${PCAP_LIBRARY}"
+                                 "${pkgcfg_lib_MAXMINDDB_maxminddb}" "-pthread")
+
 if(BUILD_EXAMPLES)
     add_executable(nDPIsrvd-collectd examples/c-collectd/c-collectd.c)
+    target_compile_options(nDPIsrvd-collectd PRIVATE ${MEMORY_PROFILING_CFLAGS})
     target_include_directories(nDPIsrvd-collectd PRIVATE
                                "${CMAKE_SOURCE_DIR}"
                                "${CMAKE_SOURCE_DIR}/dependencies"
                                "${CMAKE_SOURCE_DIR}/dependencies/jsmn"
                                "${CMAKE_SOURCE_DIR}/dependencies/uthash/src")
+
     add_executable(nDPIsrvd-captured examples/c-captured/c-captured.c utils.c)
+    target_compile_options(nDPIsrvd-captured PRIVATE ${MEMORY_PROFILING_CFLAGS})
     target_include_directories(nDPIsrvd-captured PRIVATE
                                "${CMAKE_SOURCE_DIR}"
                                "${CMAKE_SOURCE_DIR}/dependencies"
                                "${CMAKE_SOURCE_DIR}/dependencies/jsmn"
                                "${CMAKE_SOURCE_DIR}/dependencies/uthash/src")
     target_link_libraries(nDPIsrvd-captured "${PCAP_LIBRARY}")
+
     add_executable(nDPIsrvd-json-dump examples/c-json-stdout/c-json-stdout.c)
     target_include_directories(nDPIsrvd-json-dump PRIVATE
                                "${CMAKE_SOURCE_DIR}"
-                               "${CMAKE_SOURCE_DIR}/dependencies"
                                "${CMAKE_SOURCE_DIR}/dependencies/jsmn")
 endif()
 
 message(STATUS "--------------------------")
 message(STATUS "CMAKE_BUILD_TYPE.........: ${CMAKE_BUILD_TYPE}")
 message(STATUS "CMAKE_C_FLAGS............: ${CMAKE_C_FLAGS}")
+if(ENABLE_MEMORY_PROFILING)
+message(STATUS "MEMORY_PROFILING_CFLAGS..: ${MEMORY_PROFILING_CFLAGS}")
+endif()
 message(STATUS "ENABLE_SANITIZER.........: ${ENABLE_SANITIZER}")
 message(STATUS "ENABLE_SANITIZER_THREAD..: ${ENABLE_SANITIZER_THREAD}")
 message(STATUS "ENABLE_MEMORY_PROFILING..: ${ENABLE_MEMORY_PROFILING}")
 message(STATUS "STATIC_LIBNDPI_INSTALLDIR: ${STATIC_LIBNDPI_INSTALLDIR}")
 if(NOT STATIC_LIBNDPI_INSTALLDIR STREQUAL "")
+message(STATUS "`- STATIC_LIBNDPI_INC....: ${STATIC_LIBNDPI_INC}")
+message(STATUS "`- STATIC_LIBNDPI_LIB....: ${STATIC_LIBNDPI_LIB}")
 message(STATUS "`- NDPI_WITH_GCRYPT......: ${NDPI_WITH_GCRYPT}")
 message(STATUS "`- NDPI_WITH_PCRE........: ${NDPI_WITH_PCRE}")
 message(STATUS "`- NDPI_WITH_MAXMINDDB...: ${NDPI_WITH_MAXMINDDB}")