++ misc

Author: Zainullin Damir

include/ipfixprobe/flowifc.hpp

@@ -39,16 +39,16 @@
 #include <sys/time.h>
 
 #ifdef WITH_NEMEA
-#include <unirec/unirec.h>
+//#include <unirec/unirec.h>
 #else
-#define UR_FIELDS(...)
+//#define UR_FIELDS(...)
 #endif
 
 #include "ipaddr.hpp"
 
 #include <string>
 
-#include <arpa/inet.h>
+//#include <arpa/inet.h>
 
 namespace ipxp {
 
@@ -80,17 +80,17 @@ struct RecordExt {
 	 * \param [in] tmplt Unirec template.
 	 * \param [out] record Pointer to the unirec record.
 	 */
-	virtual void fill_unirec(ur_template_t* tmplt, void* record)
+	/*virtual void fill_unirec(ur_template_t* tmplt, void* record)
 	{
 		(void) tmplt;
 		(void) record;
-	}
+	}*/
 
 	/**
 	 * \brief Get unirec template string.
 	 * \return Unirec template string.
 	 */
-	virtual const char* get_unirec_tmplt() const { return ""; }
+	//virtual const char* get_unirec_tmplt() const { return ""; }
 #endif
 
 	/**
@@ -233,11 +233,11 @@ struct Record {
 	virtual ~Record() { remove_extensions(); }
 };
 
-#define FLOW_END_INACTIVE 0x01
-#define FLOW_END_ACTIVE 0x02
-#define FLOW_END_EOF 0x03
-#define FLOW_END_FORCED 0x04
-#define FLOW_END_NO_RES 0x05
+//#define FLOW_END_INACTIVE 0x01
+//#define FLOW_END_ACTIVE 0x02
+//#define FLOW_END_EOF 0x03
+//#define FLOW_END_FORCED 0x04
+//#define FLOW_END_NO_RES 0x05
 
 /**
  * \brief Flow record struct constaining basic flow record data and extension headers.

include/ipfixprobe/ipProtocol.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <cstdint>
+
+namespace ipxp
+{
+
+enum IPProtocol : uint8_t {
+    TCP = 6,
+    UDP = 17,
+};
+
+} // namespace ipxp

include/ipfixprobe/outputPlugin.hpp include/ipfixprobe/outputPlugin.hpptinclude/ipfixprobe/outputPlugin.hpp renamed to include/ipfixprobe/outputPlugin.hppt

@@ -0,0 +1,56 @@
+#pragma once
+
+#include "../api.hpp"
+#include "fieldManager.hpp"
+#include "flowRecord.hpp"
+#include "processPluginEntry.hpp"
+
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <vector>
+
+// #include "../pluginFactory/pluginFactory.hpp"
+
+namespace ipxp {
+
+using namespace process;
+
+class IPXP_API OutputPlugin {
+public:
+	OutputPlugin(const FieldManager& fieldManager, const std::vector<ProcessPluginEntry>& plugins)
+		: m_fieldManager(fieldManager)
+		, m_plugins(plugins)
+	{
+	}
+
+	virtual void processRecord(FlowRecordUniquePtr& flowRecord) = 0;
+
+	std::size_t getDroppedCount() const noexcept { return m_dropped; }
+
+	virtual ~OutputPlugin() = default;
+
+	constexpr static std::size_t DEFAULT_EXPORTER_ID = 1;
+
+protected:
+	const FieldManager& m_fieldManager;
+	const std::vector<ProcessPluginEntry>& m_plugins;
+	std::size_t m_dropped = 0;
+	std::size_t m_seen = 0;
+};
+
+template<typename Base, typename... Args>
+class IPXP_API PluginFactory;
+
+/**
+ * @brief Type alias for the OutputPlugin factory.
+ *
+ * Provides a factory for creating OutputPlugin instances using a string-based constructor.
+ */
+using OutputPluginFactory = PluginFactory<
+	OutputPlugin,
+	const std::string&,
+	const FieldManager&,
+	const std::vector<ProcessPluginEntry>&>;
+
+} // namespace ipxp

include/ipfixprobe/outputPlugin/outputPlugin.hpp

@@ -32,6 +32,8 @@
 #include <ipfixprobe/packet.hpp>
 #include <telemetry.hpp>
 
+#include "ipProtocol.hpp"
+
 namespace ipxp {
 
 static constexpr std::size_t MAX_VLAN_ID = 4096;
@@ -132,9 +134,9 @@ struct VlanStats {
 			ipv6_bytes += pkt.packet_len;
 		}
 
-		if (pkt.ip_proto == IPPROTO_TCP) {
+		if (pkt.ip_proto == IPProtocol::TCP) {
 			tcp_packets++;
-		} else if (pkt.ip_proto == IPPROTO_UDP) {
+		} else if (pkt.ip_proto == IPProtocol::UDP) {
 			udp_packets++;
 		}
 

include/ipfixprobe/parser-stats.hpp

@@ -21,6 +21,8 @@
 #include <string_view>
 #include <type_traits>
 
+#include "../api.hpp"
+
 namespace ipxp {
 
 /**
@@ -62,7 +64,7 @@ class PluginFactory {
 	void registerPlugin(const PluginManifest& manifest)
 	{
 		static_assert(std::is_base_of<Base, Derived>::value, "Derived must be a subclass of Base");
-
+		
 		m_registeredPlugins[manifest] = createGenerators<Base, Derived, Args...>();
 	}