++

Author: Damir Zainullin

include/ipfixprobe/inputPlugin.hpp

@@ -96,7 +96,7 @@ class IPXP_API InputPlugin
 	};
 
 	/// Statistics related to packet parsing.
-	ParserStats m_parser_stats{10};
+	ParserStats m_parser_stats {10};
 
 private:
 	void create_parser_stats_telemetry(

include/ipfixprobe/parser-stats.hpp

@@ -163,7 +163,6 @@ struct VlanStats {
  * \brief Structure for storing parser statistics.
  */
 struct ParserStats {
-
 	ParserStats(size_t top_ports_count)
 		: top_ports(top_ports_count)
 		, mpls_packets(0)
@@ -175,8 +174,10 @@ struct ParserStats {
 		, tcp_packets(0)
 		, udp_packets(0)
 		, seen_packets(0)
-		, unknown_packets(0) {}
-		
+		, unknown_packets(0)
+	{
+	}
+
 	TopPorts top_ports;
 
 	uint64_t mpls_packets;

src/plugins/input/parser/parser.cpp

@@ -465,7 +465,8 @@ inline uint16_t parse_ipv6_hdr(const u_char* data_ptr, uint16_t data_len, Packet
  * \param [out] pkt Pointer to Packet structure where parsed fields will be stored.
  * \return Size of header in bytes.
  */
-inline uint16_t parse_tcp_hdr(const u_char* data_ptr, uint16_t data_len, Packet* pkt, ParserStats& stats)
+inline uint16_t
+parse_tcp_hdr(const u_char* data_ptr, uint16_t data_len, Packet* pkt, ParserStats& stats)
 {
 	struct tcphdr* tcp = (struct tcphdr*) data_ptr;
 	if (sizeof(struct tcphdr) > data_len) {
@@ -480,7 +481,7 @@ inline uint16_t parse_tcp_hdr(const u_char* data_ptr, uint16_t data_len, Packet*
 	pkt->tcp_window = ntohs(tcp->window);
 
 	stats.top_ports.increment_tcp_frequency(pkt->src_port);
-    stats.top_ports.increment_tcp_frequency(pkt->dst_port);
+	stats.top_ports.increment_tcp_frequency(pkt->dst_port);
 
 	DEBUG_MSG("TCP header:\n");
 	DEBUG_MSG("\tSrc port:\t%u\n", ntohs(tcp->source));
@@ -547,7 +548,8 @@ inline uint16_t parse_tcp_hdr(const u_char* data_ptr, uint16_t data_len, Packet*
  * \param [out] pkt Pointer to Packet structure where parsed fields will be stored.
  * \return Size of header in bytes.
  */
-inline uint16_t parse_udp_hdr(const u_char* data_ptr, uint16_t data_len, Packet* pkt, ParserStats& stats)
+inline uint16_t
+parse_udp_hdr(const u_char* data_ptr, uint16_t data_len, Packet* pkt, ParserStats& stats)
 {
 	struct udphdr* udp = (struct udphdr*) data_ptr;
 	if (sizeof(struct udphdr) > data_len) {
@@ -558,7 +560,7 @@ inline uint16_t parse_udp_hdr(const u_char* data_ptr, uint16_t data_len, Packet*
 	pkt->dst_port = ntohs(udp->dest);
 
 	stats.top_ports.increment_udp_frequency(pkt->src_port);
-    stats.top_ports.increment_udp_frequency(pkt->dst_port);
+	stats.top_ports.increment_udp_frequency(pkt->dst_port);
 
 	DEBUG_MSG("UDP header:\n");
 	DEBUG_MSG("\tSrc port:\t%u\n", ntohs(udp->source));

src/plugins/input/parser/topPorts.cpp

@@ -7,56 +7,69 @@
 
 #include "topPorts.hpp"
 
-#include <functional>
 #include <algorithm>
 #include <array>
 #include <cstdint>
+#include <functional>
 #include <limits>
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace ipxp {
 
 TopPorts::TopPorts(size_t top_ports_count) noexcept
-: m_top_ports_count(top_ports_count)
+	: m_top_ports_count(top_ports_count)
 {
 }
 
 std::string TopPorts::PortStats::to_string() const noexcept
 {
-    return std::to_string(port) + "[" +
-        (protocol == Protocol::TCP ? "TCP" : "UDP") + "] - " + std::to_string(frequency);
+	return std::to_string(port) + "[" + (protocol == Protocol::TCP ? "TCP" : "UDP") + "] - "
+		+ std::to_string(frequency);
 }
 
-bool update_port_buffer(std::vector<TopPorts::PortStats>& port_buffer, TopPorts::PortStats port_stats) noexcept{
-        auto port_pos = std::lower_bound(port_buffer.begin(), port_buffer.end(), port_stats.frequency,
-        [](const TopPorts::PortStats& port_frequency, size_t count) {
-            return port_frequency.frequency >= count;
-        });
-
-        if (port_pos != port_buffer.end()) {
-            std::copy_backward(port_pos, std::prev(port_buffer.end()), port_buffer.end());
-            *port_pos = port_stats;
-            return true;
-            //ports_inserted = std::min<size_t>(m_top_ports_count, ports_inserted + 1);
-        }
-        return false;
-    };
+bool update_port_buffer(
+	std::vector<TopPorts::PortStats>& port_buffer,
+	TopPorts::PortStats port_stats) noexcept
+{
+	auto port_pos = std::lower_bound(
+		port_buffer.begin(),
+		port_buffer.end(),
+		port_stats.frequency,
+		[](const TopPorts::PortStats& port_frequency, size_t count) {
+			return port_frequency.frequency >= count;
+		});
+
+	if (port_pos != port_buffer.end()) {
+		std::copy_backward(port_pos, std::prev(port_buffer.end()), port_buffer.end());
+		*port_pos = port_stats;
+		return true;
+	}
+	return false;
+};
 
 std::vector<TopPorts::PortStats> TopPorts::get_top_ports() const noexcept
 {
-    std::vector<PortStats> port_buffer(m_top_ports_count);
-    size_t ports_inserted = 0;
-
-    std::for_each(m_tcp_port_frequencies.begin(), m_tcp_port_frequencies.end(), [&, port = uint16_t{0}](size_t frequency) mutable {
-        ports_inserted += update_port_buffer(port_buffer, {port++, frequency, PortStats::Protocol::TCP});
-    });
-    std::for_each(m_udp_port_frequencies.begin(), m_udp_port_frequencies.end(), [&, port = uint16_t{0}](size_t frequency) mutable{
-        ports_inserted += update_port_buffer(port_buffer, {port++, frequency, PortStats::Protocol::UDP});
-    });
-
-    port_buffer.resize(std::min(m_top_ports_count, ports_inserted));
-    return port_buffer;
+	std::vector<PortStats> port_buffer(m_top_ports_count);
+	size_t ports_inserted = 0;
+
+	std::for_each(
+		m_tcp_port_frequencies.begin(),
+		m_tcp_port_frequencies.end(),
+		[&, port = uint16_t {0}](size_t frequency) mutable {
+			ports_inserted
+				+= update_port_buffer(port_buffer, {port++, frequency, PortStats::Protocol::TCP});
+		});
+	std::for_each(
+		m_udp_port_frequencies.begin(),
+		m_udp_port_frequencies.end(),
+		[&, port = uint16_t {0}](size_t frequency) mutable {
+			ports_inserted
+				+= update_port_buffer(port_buffer, {port++, frequency, PortStats::Protocol::UDP});
+		});
+
+	port_buffer.resize(std::min(m_top_ports_count, ports_inserted));
+	return port_buffer;
 }
 
 } // namespace ipxp

src/plugins/input/parser/topPorts.hpp

@@ -9,73 +9,63 @@
 #include <array>
 #include <cstdint>
 #include <limits>
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace ipxp {
 /**
  * \brief Top ports counter.
  */
 class TopPorts {
 public:
+	/**
+	 * \brief Constructor.
+	 * \param top_ports_count Number of the most popular ports to track.
+	 */
+	TopPorts(size_t top_ports_count) noexcept;
 
-    /**
-     * \brief Constructor.
-     * \param top_ports_count Number of the most popular ports to track.
-     */
-    TopPorts(size_t top_ports_count) noexcept;
-
-    /**
-     * \brief Increments number of times given tcp port has been seen.
-     * \param port Port to increment its frequency.
-     */
-    void increment_tcp_frequency(uint16_t port) noexcept
-    {
-        m_tcp_port_frequencies[port]++;
-    }
+	/**
+	 * \brief Increments number of times given tcp port has been seen.
+	 * \param port Port to increment its frequency.
+	 */
+	void increment_tcp_frequency(uint16_t port) noexcept { m_tcp_port_frequencies[port]++; }
 
-    /**
-     * \brief Increments number of times given udp port has been seen.
-     * \param port Port to increment its frequency.
-     */
-    void increment_udp_frequency(uint16_t port) noexcept
-    {
-        m_udp_port_frequencies[port]++;
-    }
+	/**
+	 * \brief Increments number of times given udp port has been seen.
+	 * \param port Port to increment its frequency.
+	 */
+	void increment_udp_frequency(uint16_t port) noexcept { m_udp_port_frequencies[port]++; }
 
-    /**
-     * \brief Port frequency and protocol to which it belongs.
-     */
-    struct PortStats {
-        /**
-         * \brief Protocol type.
-         */
-        enum class Protocol {
-            TCP,
-            UDP
-        };
+	/**
+	 * \brief Port frequency and protocol to which it belongs.
+	 */
+	struct PortStats {
+		/**
+		 * \brief Protocol type.
+		 */
+		enum class Protocol { TCP, UDP };
 
-        uint16_t port; /**< Port number. */
-        size_t frequency; /**< Number of times the port has been seen. */
-        Protocol protocol; /**< Protocol to which the port belongs. */
+		uint16_t port; /**< Port number. */
+		size_t frequency; /**< Number of times the port has been seen. */
+		Protocol protocol; /**< Protocol to which the port belongs. */
 
-        /**
-         * \brief Convert the port stats to string.
-         * \return String representation of the port stats.
-         */
-        std::string to_string() const noexcept;
-    };
+		/**
+		 * \brief Convert the port stats to string.
+		 * \return String representation of the port stats.
+		 */
+		std::string to_string() const noexcept;
+	};
 
-    /**
-     * \brief Get the top ports.
-     * \return Vector of the most popular ports.
-     */
-    std::vector<TopPorts::PortStats> get_top_ports() const noexcept;
+	/**
+	 * \brief Get the top ports.
+	 * \return Vector of the most popular ports.
+	 */
+	std::vector<TopPorts::PortStats> get_top_ports() const noexcept;
 
 private:
-    std::array<std::size_t, std::numeric_limits<uint16_t>::max() + 1> m_tcp_port_frequencies {};
-    std::array<std::size_t, std::numeric_limits<uint16_t>::max() + 1> m_udp_port_frequencies {};
-    const size_t m_top_ports_count;
+	std::array<std::size_t, std::numeric_limits<uint16_t>::max() + 1> m_tcp_port_frequencies {};
+	std::array<std::size_t, std::numeric_limits<uint16_t>::max() + 1> m_udp_port_frequencies {};
+	const size_t m_top_ports_count;
 };
 
 } // namespace ipxp