++

Author: Damir Zainullin

include/ipfixprobe/flowifc.hpp

@@ -39,9 +39,9 @@
 #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"
@@ -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
 
 	/**

include/ipfixprobe/processPlugin/flowRecord.hpp

@@ -124,44 +124,38 @@ class FlowRecord {
 		return hash == value;
 	}*/
 
-	void createFrom(const Packet& packet)
+	// TODO remove hashval
+	void createFrom(const Packet& packet, uint64_t hashval)
 	{
-		m_flow.directionalData[Direction::Forward].packets = 1;
-
-		m_hash = hash;
-
-		m_flow.time_first = pkt.ts;
-		m_flow.time_last = pkt.ts;
-		m_flow.flow_hash = hash;
-
-		memcpy(m_flow.src_mac, pkt.src_mac, 6);
-		memcpy(m_flow.dst_mac, pkt.dst_mac, 6);
-
-		if (pkt.ip_version == IP::v4) {
-			m_flow.ip_version = pkt.ip_version;
-			m_flow.ip_proto = pkt.ip_proto;
-			m_flow.src_ip.v4 = pkt.src_ip.v4;
-			m_flow.dst_ip.v4 = pkt.dst_ip.v4;
-			m_flow.src_bytes = pkt.ip_len;
-		} else if (pkt.ip_version == IP::v6) {
-			m_flow.ip_version = pkt.ip_version;
-			m_flow.ip_proto = pkt.ip_proto;
-			memcpy(m_flow.src_ip.v6, pkt.src_ip.v6, 16);
-			memcpy(m_flow.dst_ip.v6, pkt.dst_ip.v6, 16);
-			m_flow.src_bytes = pkt.ip_len;
+		directionalData[Direction::Forward].packets = 1;
+		directionalData[Direction::Forward].bytes = packet.ip_len;
+
+		
+		flowKey.srcPort = packet.src_port;
+		flowKey.dstPort = packet.dst_port;
+		flowKey.l4Protocol = packet.ip_proto;
+
+		hash = hashval;
+
+		timeCreation = packet.ts;
+		timeLastUpdate = packet.ts;
+
+		macAddress[Direction::Forward] 
+			= std::span<const std::byte, 6>(
+				reinterpret_cast<const std::byte*>(packet.src_mac), 6);
+		macAddress[Direction::Reverse] 
+			= std::span<const std::byte, 6>(
+				reinterpret_cast<const std::byte*>(packet.dst_mac), 6);
+
+		if (packet.ip_version == IP::v4) {
+			flowKey.srcIp = packet.src_ip.v4;
+			flowKey.dstIp = packet.dst_ip.v4;
+		} else if (packet.ip_version == IP::v6) {
+			flowKey.srcIp = std::span<const std::byte, 16>(
+				reinterpret_cast<const std::byte*>(packet.src_ip.v6), 16);
+			flowKey.dstIp = std::span<const std::byte, 16>(
+				reinterpret_cast<const std::byte*>(packet.dst_ip.v6), 16);
 		}
-
-		if (pkt.ip_proto == IPPROTO_TCP) {
-			m_flow.src_port = pkt.src_port;
-			m_flow.dst_port = pkt.dst_port;
-			m_flow.src_tcp_flags = pkt.tcp_flags;
-		} else if (pkt.ip_proto == IPPROTO_UDP) {
-			m_flow.src_port = pkt.src_port;
-			m_flow.dst_port = pkt.dst_port;
-		} else if (pkt.ip_proto == IPPROTO_ICMP || pkt.ip_proto == IPPROTO_ICMPV6) {
-			m_flow.src_port = pkt.src_port;
-			m_flow.dst_port = pkt.dst_port;
-		}*/
 	}
 
 	void update(const Packet& packet, bool src)

include/ipfixprobe/processPlugin/macAddress.hpp

@@ -21,6 +21,16 @@ struct MACAddress {
 	{
 		std::ranges::copy(address, this->address.begin());
 	}
+
+	constexpr MACAddress& operator=(std::span<const std::byte, 6> address) noexcept
+	{
+		if (address.data() == this->address.data()) {
+			return *this;
+		}
+
+		std::ranges::copy(address, this->address.begin());
+		return *this;
+	}
 };
 
 inline std::ostream& operator<<(std::ostream& os, const MACAddress& mac)

src/plugins/storage/cache/src/cache.cpp

@@ -180,7 +180,7 @@ void NHTFlowCache::export_flow(size_t index)
 void NHTFlowCache::finish()
 {
 	for (decltype(m_cache_size) i = 0; i < m_cache_size; i++) {
-		if (!m_flow_table[i]->is_empty()) {
+		if (!m_flow_table[i]->isEmpty()) {
 			//plugins_pre_export(m_flow_table[i]->m_flow);
 			m_flow_table[i]->endReason = FlowEndReason::FLOW_END_FORCED;
 			export_flow(i);
@@ -250,7 +250,7 @@ int NHTFlowCache::put_pkt(Packet& pkt)
 
 	/* Find existing flow record in flow cache. */
 	for (flow_index = line_index; flow_index < next_line; flow_index++) {
-		if (m_flow_table[flow_index]->belongs(hashval)) {
+		if (m_flow_table[flow_index]->hash == hashval) {
 			found = true;
 			break;
 		}
@@ -262,7 +262,7 @@ int NHTFlowCache::put_pkt(Packet& pkt)
 		uint64_t line_index_inv = hashval_inv & m_line_mask;
 		uint64_t next_line_inv = line_index_inv + m_line_size;
 		for (flow_index = line_index_inv; flow_index < next_line_inv; flow_index++) {
-			if (m_flow_table[flow_index]->belongs(hashval_inv)) {
+			if (m_flow_table[flow_index]->hash == hashval_inv) {
 				found = true;
 				source_flow = false;
 				hashval = hashval_inv;
@@ -292,7 +292,7 @@ int NHTFlowCache::put_pkt(Packet& pkt)
 	} else {
 		/* Existing flow record was not found. Find free place in flow line. */
 		for (flow_index = line_index; flow_index < next_line; flow_index++) {
-			if (m_flow_table[flow_index]->is_empty()) {
+			if (m_flow_table[flow_index]->isEmpty()) {
 				found = true;
 				break;
 			}
@@ -337,9 +337,9 @@ int NHTFlowCache::put_pkt(Packet& pkt)
 		return 0;
 	}
 
-	if (flow->is_empty()) {
+	if (flow->isEmpty()) {
 		m_flows_in_cache++;
-		flow->create(pkt, hashval);
+		flow->createFrom(pkt, hashval);
 		ret = 0; //plugins_post_create(flow->m_flow, pkt);
 
 		//if (ret & FLOW_FLUSH) {
@@ -408,7 +408,7 @@ uint8_t NHTFlowCache::get_export_reason(FlowRecord& flow)
 void NHTFlowCache::export_expired(time_t ts)
 {
 	for (decltype(m_timeout_idx) i = m_timeout_idx; i < m_timeout_idx + m_line_new_idx; i++) {
-		if (!m_flow_table[i]->is_empty()
+		if (!m_flow_table[i]->isEmpty()
 			&& ts - m_flow_table[i]->timeLastUpdate.toSeconds() >= m_inactive) {
 			m_flow_table[i]->endReason = static_cast<FlowEndReason>(get_export_reason(*m_flow_table[i]));
 			m_manager.exportFlowRecord(*m_flow_table[i]);