+++ xxx

Author: Zadamsa

CMakeLists.txt

@@ -34,10 +34,13 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 option(ENABLE_RPMBUILD "Enable support for building RPM packages" ON)
 
-option(ENABLE_INPUT_PCAP "Enable build of input PCAP plugin" ON)
-option(ENABLE_INPUT_DPDK "Enable build of input DPDK plugin" ON)
-option(ENABLE_INPUT_NFB  "Enable build of input NFB plugin"  ON)
-
+option(ENABLE_INPUT_PCAP              "Enable build of input PCAP plugin" ON)
+option(ENABLE_INPUT_DPDK              "Enable build of input DPDK plugin" ON)
+option(ENABLE_INPUT_NFB               "Enable build of input NFB plugin"  ON)
+option(ENABLE_RPMBUILD                "RPM build"  ON)
+option(ENABLE_PROCESS_NETTISA         "Enable build of nettisa process plugin"  ON)
+option(ENABLE_PROCESS_EXPERIMENTAL    "Enable build of additional process plugins"  ON)
+option(ENABLE_OUTPUT_UNIREC           "Enable build of unirec output plugin"  ON)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -g -O3")

cmake/dependencies.cmake

@@ -1,5 +1,10 @@
 find_package(PkgConfig REQUIRED)
 
+#pkg_check_modules(pthread REQUIRED libpthread)
+pkg_check_modules(unwind REQUIRED libunwind)
+#pkg_check_modules(atomic REQUIRED libatomic)
+pkg_check_modules(xxhash REQUIRED xxhash-devel)
+
 if (ENABLE_INPUT_PCAP)
 	pkg_check_modules(PCAP REQUIRED libpcap)
 endif()

pkg/rpm/CMakeLists.txt

@@ -30,6 +30,14 @@ if (ENABLE_INPUT_NFB)
 	list(APPEND RPMBUILD_ARGS "--with" "input_nfb")
 endif()
 
+if (ENABLE_PROCESS_NETTISA)
+	list(APPEND RPMBUILD_ARGS "--with" "process_nettisa")
+endif()
+
+if (ENABLE_PROCESS_EXPERIMENTAL)
+	list(APPEND RPMBUILD_ARGS "--with" "process_experimental")
+endif()
+
 configure_file("${SPEC_FILE_IN}" "${SPEC_FILE}" @ONLY)
 
 add_custom_target(rpm

src/plugins/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_subdirectory(input)
 add_subdirectory(output)
-#add_subdirectory(process)
-#add_subdirectory(storage)
+add_subdirectory(process)
+add_subdirectory(storage)

src/plugins/input/nfb/CMakeLists.txt

@@ -9,8 +9,10 @@ add_library(ipfixprobe-input-nfb MODULE
 	src/ndpreader.hpp
 )
 
-target_include_directories(ipfixprobe-input-nfb PRIVATE ${CMAKE_SOURCE_DIR}/include/)
-target_include_directories(ipfixprobe-input-nfb PRIVATE ${CMAKE_SOURCE_DIR}/src/plugins/input/common)
+target_include_directories(ipfixprobe-input-nfb PRIVATE
+	${CMAKE_SOURCE_DIR}/include/
+	${CMAKE_SOURCE_DIR}/src/plugins/input/common
+)
 
 target_link_libraries(ipfixprobe-input-nfb PRIVATE ipfixprobe-parser)
 target_link_libraries(ipfixprobe-input-nfb PRIVATE nfb::nfb)

src/plugins/process/CMakeLists.txt

@@ -1,11 +1,13 @@
 add_subdirectory(common)
-add_subdirectory(bstats)
 add_subdirectory(basicplus)
+add_subdirectory(bstats)
+#add_subdirectory(dns)
+#add_subdirectory(dnssd)
+add_subdirectory(flow_hash)
 add_subdirectory(http)
 add_subdirectory(icmp)
 add_subdirectory(pstats)
 add_subdirectory(mpls)
-add_subdirectory(nettisa)
 add_subdirectory(phists)
 add_subdirectory(ovpn)
 add_subdirectory(ntp)
@@ -16,4 +18,12 @@ add_subdirectory(tls)
 add_subdirectory(wg)
 add_subdirectory(rtsp)
 add_subdirectory(smtp)
-add_subdirectory(quic)
+add_subdirectory(quic)
+
+if (ENABLE_PROCESS_NETTISA)
+    add_subdirectory(nettisa)
+endif ()
+
+if (ENABLE_PROCESS_EXPERIMENTAL)
+    #add_subdirectory(sip)
+endif ()

src/plugins/process/dns.cpp src/plugins/process/dns/src/dns.cppsrc/plugins/process/dns.cpp renamed to src/plugins/process/dns/src/dns.cpp

@@ -32,6 +32,7 @@
 #include <iostream>
 #include <sstream>
 #include <arpa/inet.h>
+#include <ipfixprobe.hpp>
 
 #ifdef WITH_NEMEA
 #include <unirec/unirec.h>
@@ -41,14 +42,14 @@
 
 namespace ipxp {
 
-int RecordExtDNS::REGISTERED_ID = -1;
+int RecordExtDNS::REGISTERED_ID = register_extension();
 
-__attribute__((constructor)) static void register_this_plugin()
-{
-   static PluginRecord rec = PluginRecord("dns", [](){return new DNSPlugin();});
-   register_plugin(&rec);
-   RecordExtDNS::REGISTERED_ID = register_extension();
-}
+static const PluginManifest dnsPluginManifest = {
+    .name = "dns",
+    .description = "",
+    .pluginVersion = "1.0.0",
+    .apiVersion = "1.0.0",
+};
 
 //#define DEBUG_DNS
 
@@ -675,4 +676,6 @@ int DNSPlugin::add_ext_dns(const char *data, unsigned int payload_len, bool tcp,
    return FLOW_FLUSH;
 }
 
+static const PluginRegistrar<DNSPlugin, PluginFactory<ProcessPlugin>> dnsRegistrar(dnsPluginManifest);
+
 }

src/plugins/process/dns.hpp src/plugins/process/dns/src/dns.hppsrc/plugins/process/dns.hpp renamed to src/plugins/process/dns/src/dns.hpp

@@ -43,14 +43,14 @@
 
 namespace ipxp {
 
-int RecordExtDNSSD::REGISTERED_ID = -1;
+int RecordExtDNSSD::REGISTERED_ID = register_extension();
 
-__attribute__((constructor)) static void register_this_plugin()
-{
-   static PluginRecord rec = PluginRecord("dnssd", [](){return new DNSSDPlugin();});
-   register_plugin(&rec);
-   RecordExtDNSSD::REGISTERED_ID = register_extension();
-}
+static const PluginManifest dnssdPluginManifest = {
+    .name = "dnssd",
+    .description = "",
+    .pluginVersion = "1.0.0",
+    .apiVersion = "1.0.0",
+};
 
 // #define DEBUG_DNSSD
 
@@ -691,4 +691,6 @@ int DNSSDPlugin::add_ext_dnssd(const char *data, unsigned int payload_len, bool
    return 0;
 }
 
+static const PluginRegistrar<DNSSDPlugin, PluginFactory<ProcessPlugin>> dnssdRegistrar(dnssdPluginManifest);
+
 }