++

Author: Damir Zainullin

process-plugin-api/Makefile

@@ -1,14 +1,14 @@
 CXX := g++
 CXXFLAGS := -std=c++20 -Wall -Wextra -pedantic -Wunused -Wconversion -Wsign-conversion -g -fsanitize=address
 TARGET := ipx
-SRC := main.cpp
+SRC := main.cpp $(wildcard process/*/src/*.cpp)
 
 .PHONY: all clean
 
 all: $(TARGET)
 
 $(TARGET): $(SRC)
-	$(CXX) $(CXXFLAGS) $^ -o $@
+	$(CXX) $(CXXFLAGS) $^ -I. -I../include/ipfixprobe/pluginFactory -o $@
 
 clean:
 	rm -f $(TARGET)

process-plugin-api/biflowPair.hpp

@@ -3,6 +3,8 @@
 #include <string>
 #include <utility>
 
+namespace ipxp {
+
 /**
  * @brief Represents a pair of field names that are semantically linked in a bidirectional flow.
  *
@@ -46,3 +48,5 @@ struct BiflowPair {
 	 */
 	bool operator!=(const BiflowPair& other) const { return !(*this == other); }
 };
+
+} // namespace ipxp

process-plugin-api/directionalField.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <cstdint>
+
+enum Direction : std::size_t { Forward = 0, Reverse = 1 };
+
+template<typename T>
+struct DirectionalField {
+	T values[2]{};
+
+	T& operator[](Direction d) { return values[static_cast<std::size_t>(d)]; }
+	const T& operator[](Direction d) const { return values[static_cast<std::size_t>(d)]; }
+};

process-plugin-api/dummyProcessPlugin.hpp

@@ -5,16 +5,8 @@
 #include "fieldSchema.hpp"
 #include "processPlugin.hpp"
 #include "flowRecord.hpp"
+#include "directionalField.hpp"
 
-enum Direction : std::size_t { Forward = 0, Reverse = 1 };
-
-template<typename T>
-struct DirectionalField {
-	T values[2];
-
-	T& operator[](Direction d) { return values[static_cast<std::size_t>(d)]; }
-	const T& operator[](Direction d) const { return values[static_cast<std::size_t>(d)]; }
-};
 
 /*
 struct DummyExport {
@@ -34,6 +26,8 @@ struct DummyExport {
 };
 */
 
+namespace ipxp {
+
 struct DummyExport {
 	DirectionalField<uint8_t> ipTtl;
 	DirectionalField<uint8_t> ipFlag;
@@ -170,10 +164,11 @@ class DummyPlugin
 		return FlowAction::RequestNoData;
 	}
 
-	FlowAction onFlowUpdate(FlowRecord& flowRecord, const Packet& packet) override
+	FlowAction onFlowUpdate(FlowRecord& flowRecord, const Packet& packet, const PacketOfFlowData& data) override
 	{
 		(void) flowRecord;
 		(void) packet;
+		(void) data;
 
 		m_exportData.packets[Direction::Forward] = {1, 2, 3, 4, 5, 6};
 		m_fieldHandlers[DummyFields::PACKETS].setAsAvailable(flowRecord);
@@ -200,3 +195,5 @@ class DummyPlugin
 private:
 	DummyExport m_exportData;
 };
+
+} // namespace ipxp

process-plugin-api/fieldAccessor.hpp

@@ -6,6 +6,8 @@
 #include <string>
 #include <variant>
 
+namespace ipxp {
+
 /**
  * @brief Accessor for reading a scalar field of type T from a binary structure using offset.
  *
@@ -95,3 +97,5 @@ using VectorValueGetter = std::variant<
  * Used in output fields to provide unified access to underlying data.
  */
 using GenericValueGetter = std::variant<ScalarValueGetter, VectorValueGetter>;
+
+} // namespace ipxp

process-plugin-api/fieldDescription.hpp

@@ -7,6 +7,8 @@
 #include <string>
 #include <variant>
 
+namespace ipxp {
+
 /**
  * @brief Describes a field in a flow record schema.
  *
@@ -27,3 +29,5 @@ struct FieldDescription {
 	/// Value getter that allows access to the field's value in a record.
 	GenericValueGetter getter;
 };
+
+} // namespace ipxp

process-plugin-api/fieldDirection.hpp

@@ -3,7 +3,9 @@
 #include <cstdint>
 #include <stdexcept>
 
-/**
+namespace ipxp {
+
+	/**
  * @brief Enum representing the direction of a flow field.
  *
  * FieldDirection enum is used to represent the possible directions for a field.
@@ -87,3 +89,5 @@ inline const char* toString(FieldDirection dir)
 		throw std::invalid_argument("Unknown FieldDirection value.");
 	}
 }
+
+} // namespace ipxp

process-plugin-api/fieldHandler.hpp

@@ -6,6 +6,8 @@
 #include <limits>
 #include <stdexcept>
 
+namespace ipxp {
+
 /**
  * @brief Represents a handle to a single field within a FlowRecord.
  *
@@ -90,3 +92,5 @@ class FieldHandler {
 	static constexpr std::size_t s_invalidIndex = std::numeric_limits<std::size_t>::max();
 	std::size_t m_bitIndex;
 };
+
+} // namespace ipxp

process-plugin-api/fieldManager.hpp

@@ -20,6 +20,8 @@
 #include <string_view>
 #include <vector>
 
+namespace ipxp {
+
 /**
  * @brief Manages field handlers and schema registrations.
  *
@@ -54,3 +56,5 @@ class FieldManager {
 	std::vector<FieldSchema> m_schemas;
 	std::atomic<std::size_t> m_fieldIndex = 0;
 };
+
+} // namespace ipxp

process-plugin-api/fieldSchema.hpp

@@ -12,6 +12,8 @@
 #include <string_view>
 #include <vector>
 
+namespace ipxp {
+
 /**
  * @brief Represents the schema of a flow record, including field definitions and biflow mappings.
  *
@@ -144,3 +146,5 @@ class FieldSchema {
 	std::vector<FieldDescription> m_fields;
 	std::vector<BiflowPair> m_biflowPairs;
 };
+
+} // namespace ipxp