++

Author: Zainullin Damir

include/ipfixprobe/processPlugin/fieldGroup.hpp

@@ -52,7 +52,7 @@ namespace ipxp {
  * DirectionalPair is used for fields that have a forward and a reverse component.
  * Typical example: `packets` (forward) and `packets_rev` (reverse).
  *
- * Behavior depends on flow orientation:
+ * Behavior depends on flow view:
  *
  * | Flow Type        | Forward Field       | Reverse Field       |
  * |------------------|---------------------|---------------------|
@@ -67,7 +67,7 @@ namespace ipxp {
  *
  * BiflowPair is used for fields that conceptually belong to two sides of a bidirectional flow.
  * Typical example: `src_port` (A) and `dst_port` (B).
- * Behavior depends on flow orientation:
+ * Behavior depends on flow view:
  *
  * | Flow Type        | A Field         | B Field         |
  * |------------------|-----------------|-----------------|
@@ -328,7 +328,7 @@ class FieldGroup {
 				std::move(accessorB));
 		}
 
-		__builtin_unreachable();
+		throw std::logic_error("Unreachable code in addPairFieldsGeneric");
 	}
 
 	std::string m_groupName;

include/ipfixprobe/processPlugin/fieldGroupTypeTraits.hpp

@@ -1,14 +1,14 @@
 /**
  * @file
  * @author Pavel Siska <siska@cesnet.cz>
- * @brief Type traits and helpers for FieldSchema, including scalar/vector detection and
+ * @brief Type traits and helpers for FieldGroup, including scalar/vector detection and
  * element type extraction.
  *
- * This header defines compile-time utilities used by FieldSchema to:
+ * This header defines compile-time utilities used by FieldGroup to:
  * - Determine if an accessor is scalar or vector.
  * - Extract element type from std::span or scalar type.
  *
- * @note These helpers are intended primarily for use within FieldSchema.
+ * @note These helpers are intended primarily for use within FieldGroup.
  *
  * @copyright Copyright (c) 2025 CESNET, z.s.p.o.
  */

include/ipfixprobe/processPlugin/fieldManager.hpp

@@ -4,7 +4,7 @@
  * @brief FieldManager manages registration and organization of FlowRecord fields.
  *
  * FieldManager is responsible for:
- * - Creating FieldSchema instances for different logical groups
+ * - Creating FieldGroup instances for different logical groups
  * - Registering scalar and directional fields
  * - Keeping track of biflow and uniflow fields
  * - Providing access to field descriptors for introspection and validation
@@ -29,7 +29,7 @@
 
 namespace ipxp {
 
-class FieldSchema;
+class FieldGroup;
 
 /**
  * @class FieldManager
@@ -41,11 +41,11 @@ class FieldSchema;
 class FieldManager {
 public:
 	/**
-	 * @brief Creates a FieldSchema for a given group name.
+	 * @brief Creates a FieldGroup for a given name.
 	 * @param groupName Logical group name (e.g., "dns", "http").
-	 * @return Newly created FieldSchema instance.
+	 * @return Newly created FieldGroup instance.
 	 */
-	[[nodiscard]] FieldSchema createFieldSchema(std::string_view groupName);
+	[[nodiscard]] FieldGroup createFieldGroup(std::string_view groupName);
 
 	/** @brief Returns all biflow fields. */
 	const std::vector<FieldDescriptor>& getBiflowFields() const;
@@ -60,8 +60,8 @@ class FieldManager {
 	const std::vector<FieldDescriptor>& getUniflowReverseFields() const;
 
 private:
-	// registration of field can only be done by FieldSchema
-	friend class FieldSchema;
+	// registration of field can only be done by FieldGroup
+	friend class FieldGroup;
 
 	[[nodiscard]] FieldHandler registerField(
 		std::string_view groupName,
@@ -84,12 +84,19 @@ class FieldManager {
 
 	[[nodiscard]] std::size_t getNextBitIndex() noexcept { return m_fieldIndex++; }
 
+	void addField(
+		std::vector<FieldDescriptor>& container,
+		std::string_view group,
+		std::string_view name,
+		std::size_t bitIndex,
+		GenericValueGetter getter);
+
 	std::vector<FieldDescriptor> m_biflowFields;
 	std::vector<FieldDescriptor> m_reverseBiflowFields;
 	std::vector<FieldDescriptor> m_uniflowForwardFields;
 	std::vector<FieldDescriptor> m_uniflowReverseFields;
 
-	std::atomic<std::size_t> m_fieldIndex = 0;
+	std::size_t m_fieldIndex = 0;
 };
 
 } // namespace ipxp

…ipfixprobe/processPlugin/fieldSchema.hpp …pfixprobe/processPlugin/fieldSchema.hpptinclude/ipfixprobe/processPlugin/fieldSchema.hpp renamed to include/ipfixprobe/processPlugin/fieldSchema.hppt include/ipfixprobe/processPlugin/fieldSchema.hpp renamed to include/ipfixprobe/processPlugin/fieldSchema.hppt

@@ -69,15 +69,16 @@ class FlowRecord {
 
 	FlowEndReason endReason;
 
+
 	// Bitset of flow fields that were specified as present
 	mutable FieldsBitset fieldsAvailable = {};
 	// Bitset of successfully constructed plugins (constructor accepted packet)
 	PluginsBitset pluginsConstructed = {};
 	// Bitset of plugins that still wants to process packets of the flow
 	PluginsBitset pluginsUpdate = {};
 	// Bitset of plugins that are available for the flow
-	// TODO GET BACK CONST ?
-	PluginsBitset pluginsAvailable;
+	const PluginsBitset pluginsAvailable;
+
 
 	void erase()
 	{
@@ -194,6 +195,7 @@ class FlowRecord {
 	// TODO PRIVATE
 	FlowRecord(PluginsBitset pluginsAvailable = {})
 		: pluginsAvailable(pluginsAvailable)
+		, pluginsUpdate(pluginsAvailable)
 	{
 	}
 

include/ipfixprobe/processPlugin/flowRecord.hpp

@@ -36,10 +36,12 @@ union IPAddress {
 		std::memcpy(&u8, ipv6.data(), sizeof(u8));
 	}
 
-	constexpr IPAddress(const ipaddr_t address) noexcept
+	constexpr IPAddress(const ipaddr_t address, IP version) noexcept
+	: IPAddress(address.v4)
 	{
-		// TODO
-		(void)address;
+		if (version == IP::v6) {
+			std::memcpy(&u8, address.v6, 16);
+		}
 	}
 
 	constexpr IPAddress(const IPAddress& other) noexcept
@@ -59,6 +61,14 @@ union IPAddress {
 		return !isIPv4();
 	}
 
+	//constexpr bool operator==(const IPAddress&) const noexcept = default;
+
+
+	constexpr auto operator<=>(const IPAddress& other) const noexcept
+	{
+		return u64 <=> other.u64;
+	}
+
 	constexpr bool operator==(const IPAddress& other) const noexcept
 	{
 		return u8 == other.u8;
@@ -102,6 +112,11 @@ union IPAddress {
 
 };
 
+/*friend constexpr auto operator<=>(const IPAddress& lhs, const IPAddress& rhs) noexcept 
+{
+    return lhs.u64 <=> rhs.u64;
+}*/
+
 inline std::ostream& operator<<(std::ostream& os, const IPAddress& ip)
 {
 	return os << ip.toString();

include/ipfixprobe/processPlugin/ipAddress.hpp

@@ -15,8 +15,6 @@
 #pragma once
 
 #include <cstdint>
-
-#include "packet.hpp"
 #include "fieldManager.hpp"
 #include "../api.hpp"
 
@@ -163,21 +161,28 @@ class IPXP_API ProcessPlugin {
 		= 0;
 
 	/**
-	 * @brief Called to update plugin state for a constructed flow.
+	 * @brief Called before the main per-packet update.
+	 *
+	 * This method is invoked for each packet of a flow **before** the standard
+	 * update phase (`onUpdate()`) is executed. It allows the plugin to perform
+	 * early decisions or actions that must happen prior to flow statistics being
+	 * updated or other plugins being called.
+	 *
+	 * Typical use cases include:
+	 *  - Requesting flow export and immediate re-insertion
+	 *    (e.g., splitting a stream into multiple flows such as individual HTTP
+	 *    requests or SIP sessions).
+	 *  - Forcing a flow flush before normal packet processing.
 	 *
-	 * This method is called for each packet of a flow after the plugin has been constructed
-	 * (onInit returned ConstructionState::Constructed and RequiresUpdate). It allows the plugin
-	 * to process packets and update its internal state. If the plugin no longer requires updates,
-	 * it should return UpdateRequirement::NoUpdateNeeded. The method can also request actions such
-	 * as flushing or removing the plugin from the flow.
 	 *
 	 * @param flowContext Context containing references to the flow and packet.
 	 * @param pluginContext Pointer to plugin-specific context memory.
 	 * @return PluginUpdateResult describing update requirements and actions.
 	 */
 	[[nodiscard]] virtual PluginUpdateResult
-	onUpdate(const FlowContext& flowContext, void* pluginContext)
+	beforeUpdate(const FlowContext& flowContext, void* pluginContext)
 	{
+		// TODO
 		(void) flowContext;
 		(void) pluginContext;
 		return {
@@ -186,6 +191,29 @@ class IPXP_API ProcessPlugin {
 		};
 	}
 
+	/**
+	 * @brief Called to update plugin state for a constructed flow.
+	 *
+	 * This method is called for each subsequent packet of a flow after the plugin has been
+	 * constructed. Importantly, onUpdate() is **not called for the same packet** that triggered
+	 * onInit(). Instead, the first invocation of onUpdate() happens with the *next* packet of the
+	 * flow. This ensures that initialization and the first update are clearly separated.
+	 *
+	 * The plugin can use this method to process packets and update its internal state. If the
+	 * plugin no longer requires updates, it should return UpdateRequirement::NoUpdateNeeded. The
+	 * method can also request actions such as flushing or removing the plugin from the flow.
+	 *
+	 * @param flowContext Context containing references to the flow and packet.
+	 * @param pluginContext Pointer to plugin-specific context memory.
+	 * @return PluginUpdateResult describing update requirements and actions.
+	 */
+	[[nodiscard]] virtual PluginUpdateResult
+	onUpdate(const FlowContext& flowContext, void* pluginContext)
+	{
+		throw std::logic_error(
+			"Unexpected call to Base::onUpdate(). Override this method in your plugin.");
+	}
+
 	/**
 	 * @brief Called to export the flow record processed by the plugin.
 	 *