++ yyy

Author: Zadamsa

cmake/dependencies.cmake

@@ -1,14 +1,12 @@
 find_package(PkgConfig REQUIRED)
 
 find_package(unwind REQUIRED)
-find_package(Threads REQUIRED)
-#find_package(Atomic REQUIRED)
-find_library(ATOMIC_LIBRARY NAMES atomic)
-find_library(DL_LIBRARY NAMES dl)
+find_package(atomic REQUIRED)
 find_package(lz4 REQUIRED)
 
-if(NOT DL_LIBRARY)
-	message(FATAL_ERROR "dl library not found!")
+find_package(Threads REQUIRED)
+if(NOT CMAKE_USE_PTHREADS_INIT)
+  message(FATAL_ERROR "pthreads not found!")
 endif()
 
 if (ENABLE_INPUT_PCAP)

cmake/modules/Findatomic.cmake

@@ -0,0 +1,29 @@
+# Try to find libatomic
+# Once done, this will define
+#
+# ATOMIC_FOUND        - system has libatomic
+# ATOMIC_LIBRARIES    - libraries needed to use libatomic
+#
+
+find_library(ATOMIC_LIBRARY
+  NAMES atomic
+  HINTS ${ATOMIC_ROOT}
+  PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args (atomic
+  REQUIRED_VARS ATOMIC_LIBRARY
+)
+
+if (ATOMIC_FOUND AND NOT TARGET atomic::atomic)
+  add_library(atomic::atomic STATIC IMPORTED)
+  set_target_properties(atomic::atomic PROPERTIES
+    IMPORTED_LOCATION "${ATOMIC_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${ATOMIC_INCLUDE_DIR}")
+  target_compile_definitions(atomic::atomic INTERFACE UNWIND_FOUND)
+else()
+  message(CRITICAL "Notice: atomic not found")
+  add_library(atomic::atomic INTERFACE IMPORTED)
+endif()
+
+unset(ATOMIC_LIBRARY)

src/plugins/input/dpdk/src/dpdk-ring.h

@@ -139,13 +139,13 @@ class DpdkRingReader : public InputPlugin {
     struct NfbTimestamp {
         uint32_t timestamp_ns;
         uint32_t timestamp_s;
-    } __rte_packed;
+    } __attribute__((packed));
 
     struct NfbMetadata {
         NfbTimestamp timestamp;
         uint16_t matched;
         uint32_t hash;
-    } __rte_packed;
+    } __attribute__((packed));
 
     telemetry::Content get_queue_telemetry();
     void getDynfieldInfo();

src/plugins/process/dns/CMakeLists.txt

@@ -0,0 +1,16 @@
+project(ipfixprobe-process-dns VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-dns plugin")
+
+add_library(ipfixprobe-process-dns SHARED
+    src/dns.cpp
+    src/dns.hpp
+)
+
+target_include_directories(ipfixprobe-process-dns PRIVATE
+    ${CMAKE_SOURCE_DIR}/include/
+    ${CMAKE_SOURCE_DIR}/src/plugins/process/common
+)
+
+install(
+    TARGETS ipfixprobe-process-dns
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixprobe/process/"
+)

src/plugins/process/dnssd/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(ipfixprobe-process-dnssd VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-dnssd plugin")
+
+add_library(ipfixprobe-process-dnssd SHARED
+    src/dnssd.cpp
+    src/dnssd.hpp
+)
+
+target_include_directories(ipfixprobe-process-dnssd PRIVATE ${CMAKE_SOURCE_DIR}/include/)
+
+install(
+    TARGETS ipfixprobe-process-dnssd
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixprobe/process/"
+)

src/plugins/process/flow_hash/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(ipfixprobe-process-flowhash VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-flowhash plugin")
+
+add_library(ipfixprobe-process-flowhash SHARED
+    src/flow_hash.cpp
+    src/flow_hash.hpp
+)
+
+target_include_directories(ipfixprobe-process-flowhash PRIVATE ${CMAKE_SOURCE_DIR}/include/)
+
+install(
+    TARGETS ipfixprobe-process-flowhash
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixprobe/process/"
+)

src/plugins/process/idpcontent/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(ipfixprobe-process-idpcontent VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-idpcontent plugin")
+
+add_library(ipfixprobe-process-idpcontent SHARED
+    src/idpcontent.cpp
+    src/idpcontent.hpp
+)
+
+target_include_directories(ipfixprobe-process-idpcontent PRIVATE ${CMAKE_SOURCE_DIR}/include/)
+
+install(
+    TARGETS ipfixprobe-process-idpcontent
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixprobe/process/"
+)

src/plugins/process/mqtt/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(ipfixprobe-process-mqtt VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-mqtt plugin")
+
+add_library(ipfixprobe-process-mqtt SHARED
+    src/mqtt.cpp
+    src/mqtt.hpp
+)
+
+target_include_directories(ipfixprobe-process-mqtt PRIVATE ${CMAKE_SOURCE_DIR}/include/)
+
+install(
+    TARGETS ipfixprobe-process-mqtt
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixprobe/process/"
+)

src/plugins/process/passivedns/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(ipfixprobe-process-passivedns VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-passivedns plugin")
+
+add_library(ipfixprobe-process-passivedns SHARED
+    src/passivedns.cpp
+    src/passivedns.hpp
+)
+
+target_include_directories(ipfixprobe-process-bstats PRIVATE ${CMAKE_SOURCE_DIR}/include/)
+
+install(
+    TARGETS ipfixprobe-process-passivedns
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixprobe/process/"
+)

src/plugins/process/sip/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(ipfixprobe-process-sip VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-sip plugin")
+
+add_library(ipfixprobe-process-sip SHARED
+    src/sip.cpp
+    src/sip.hpp
+)
+
+target_include_directories(ipfixprobe-process-sip PRIVATE ${CMAKE_SOURCE_DIR}/include/)
+
+install(
+    TARGETS ipfixprobe-process-sip
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixprobe/process/"
+)