++

Author: Zainullin Damir

CMakeLists.txt

@@ -35,7 +35,7 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 

include/ipfixprobe/pluginFactory/pluginFactory.hpp

@@ -65,8 +65,6 @@ class PluginFactory {
 	{
 		static_assert(std::is_base_of<Base, Derived>::value, "Derived must be a subclass of Base");
 
-		std::cout << manifest.name << "=" << std::hex << std::size_t(this) << std::endl;
-
 		m_registeredPlugins[manifest] = createGenerators<Base, Derived, Args...>();
 	}
 

include/ipfixprobe/processPlugin/fieldManager.hpp

@@ -20,6 +20,7 @@
 #include "fieldDescriptor.hpp"
 #include "fieldGenericValueGetter.hpp"
 #include "fieldHandler.hpp"
+#include "../api.hpp"
 
 #include <atomic>
 #include <cstdint>
@@ -38,7 +39,7 @@ class FieldGroup;
  * Provides methods to register fields, directional field pairs, and biflow pairs.
  * Offers access to field descriptors grouped by biflow/uniflow and direction.
  */
-class FieldManager {
+class IPXP_API FieldManager {
 public:
 	/**
 	 * @brief Creates a FieldGroup for a given name.

include/ipfixprobe/processPlugin/flowKey.hpp

@@ -6,7 +6,20 @@
 
 namespace ipxp {
 
+struct FlowKeyLayout {    
+    std::size_t size;
+    std::size_t alignment;
+};
+
 struct FlowKey {
+    constexpr static FlowKeyLayout getLayout() noexcept
+    {
+        return {
+            .size = sizeof(FlowKey),
+            .alignment = alignof(FlowKey),
+        };
+    };
+
 	IPAddress srcIp;
 	IPAddress dstIp;
 	uint16_t srcPort;
@@ -20,9 +33,8 @@ struct FlowKey {
     }
 };
 
-struct FlowKeyLayout {
-    std::size_t size;
-    std::size_t alignment;
-};
+
+
+
 
 } // namespace ipxp

include/ipfixprobe/processPlugin/processPluginEntry.hpp

@@ -16,6 +16,8 @@
 #include <memory>
 #include <string>
 
+#include "../api.hpp"
+
 namespace ipxp {
 
 class ProcessPlugin;
@@ -27,7 +29,7 @@ class ProcessPlugin;
  * and runtime requirements. It contains the plugin's name, context
  * memory requirements, and activation state.
  */
-struct ProcessPluginEntry {
+struct IPXP_API ProcessPluginEntry {
 	/**< @brief Human-readable plugin name (unique identifier). */
 	std::string name;
 

include/ipfixprobe/processPlugin/processPluginManager.hpp

@@ -6,10 +6,11 @@
 #include "processPluginEntry.hpp"
 #include "flowRecordBuilder.hpp"
 #include "../pluginFactory/pluginFactory.hpp"
+#include "../api.hpp"
 
 namespace ipxp {
 
-class ProcessPluginManager {
+class IPXP_API ProcessPluginManager {
 public:
 	ProcessPluginManager(FieldManager& manager)
 		: m_fieldManager(manager)
@@ -189,7 +190,11 @@ class ProcessPluginManager {
 		}
 #endif
 
-	std::shared_ptr<FlowRecordBuilder> rebuild();
+	std::shared_ptr<FlowRecordBuilder> rebuild()
+	{
+		auto builder = std::make_shared<FlowRecordBuilder>(m_processPlugins, FlowKey::DEFAULT_LAYOUT);
+		return builder;
+	}
 
 	const std::vector<ProcessPluginEntry>& getEntries() { return m_processPlugins; }
 

src/plugins/output/unirec/src/unirec.hpp

@@ -228,7 +228,7 @@ class UnirecOptParser : public OptionsParser {
 /**
  * \brief Class for exporting flow records.
  */
-class UnirecExporter : public OutputPlugin {
+class IPXP_API UnirecExporter : public OutputPlugin {
 public:
 
 	UnirecExporter(const std::string& params, const FieldManager& manager, const std::vector<ProcessPluginEntry>& plugins)

src/plugins/process/basicPlus/src/basicPlus.cpp

@@ -24,6 +24,7 @@
 #include <fieldGroup.hpp>
 #include <fieldManager.hpp>
 #include <tcpData.hpp>
+#include <ipfixprobe/options.hpp>
 
 namespace ipxp {
 
@@ -34,11 +35,10 @@ static const PluginManifest basicPlusPluginManifest = {
 	.apiVersion = "1.0.0",
 	.usage =
 		[]() {
-			std::cout << "tes666" << std::endl;
-			/*OptionsParser parser(
+			OptionsParser parser(
 				"basicplus",
 				"Extend basic fields with TTL, TCP window, options, MSS and SYN size");
-			parser.usage(std::cout);*/
+			parser.usage(std::cout);
 		},
 };
 

src/plugins/process/bstats/src/burstStats.cpp

@@ -25,20 +25,19 @@
 //#include <pluginFactory.hpp>
 #include <fieldGroup.hpp>
 //#include <fieldManager.hpp>
+#include <ipfixprobe/options.hpp>
 
 namespace ipxp {
 
-
 static const PluginManifest burstStatsPluginManifest = {
 	.name = "bstats",
 	.description = "Bstats process plugin for computing packet bursts stats.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
 	.usage =
 		[]() {
-			std::cout << "Test" << std::endl;
-			/*OptionsParser parser("bstats", "Compute packet bursts stats");
-			parser.usage(std::cout);*/
+			OptionsParser parser("bstats", "Compute packet bursts stats");
+			parser.usage(std::cout);
 		},
 };
 

src/plugins/process/common/dnsParser/dnsRecordPayloadTypes/dnsTXTRecord.hpp

@@ -13,27 +13,29 @@ namespace ipxp
 {
 
 struct DNSTXTRecord {
-    DNSName content;
+    //DNSName content;
+    std::string content;
 
     static std::optional<DNSTXTRecord> createFrom(
         std::span<const std::byte> payload,
         std::span<const std::byte> fullDNSPayload) noexcept
     {
         auto res = std::make_optional<DNSTXTRecord>();
 
-        const std::optional<DNSName> txt 
+        /*const std::optional<DNSName> txt 
             = DNSName::createFrom(payload, fullDNSPayload);
         if (!txt.has_value() || txt->length() == 0) {
             return std::nullopt;
         }
         res->content = *txt;
-
+*/
+        res->content = std::string(reinterpret_cast<const char*>(payload.data()), payload.size());
         return res;
     }
 
     std::string toDNSString() const noexcept
     {
-        std::string res = content.toString();
+        std::string res = content;
         const std::size_t firstPoint = res.find('.');
         if (firstPoint != std::string::npos) {
             res[firstPoint] = ' ';