++

Author: Zainullin Damir

src/plugins/process/basicPlus/src/basicPlus.cpp

@@ -32,6 +32,7 @@ static const PluginManifest basicPlusPluginManifest = {
 	.apiVersion = "1.0.0",
 	.usage =
 		[]() {
+			std::cout << "Extend basic fields with TTL, TCP window, options, MSS and SYN size" << std::endl;
 			/*OptionsParser parser(
 				"basicplus",
 				"Extend basic fields with TTL, TCP window, options, MSS and SYN size");

src/plugins/process/bstats/src/burstStats.cpp

@@ -88,7 +88,7 @@ PluginInitResult BurstStatsPlugin::onInit(const FlowContext& flowContext, void*
 	auto* pluginData = std::construct_at(reinterpret_cast<BurstStatsData*>(pluginContext));
 
 	std::optional<Burst> burst = pluginData->push(Direction::Forward);
-	updateBursts(*burst, flowContext.flowRecord, flowContext.packet);
+	updateBursts(*burst, flowContext.packet);
 
 	return {
 		.constructionState = ConstructionState::Constructed,
@@ -97,8 +97,7 @@ PluginInitResult BurstStatsPlugin::onInit(const FlowContext& flowContext, void*
 	};
 }
 
-void BurstStatsPlugin::updateBursts(Burst& burst, FlowRecord& flowRecord,
-	const Packet& packet) noexcept
+void BurstStatsPlugin::updateBursts(Burst& burst, const Packet& packet) noexcept
 {
 	burst.packets++;
 	burst.bytes += packet.ip_payload_len;	
@@ -123,15 +122,15 @@ PluginUpdateResult BurstStatsPlugin::onUpdate(const FlowContext& flowContext, vo
 		};
 	}
 
-	updateBursts(*burst, flowContext.flowRecord, flowContext.packet);
+	updateBursts(*burst, flowContext.packet);
 
 	return {
 		.updateRequirement = UpdateRequirement::RequiresUpdate,
 		.flowAction = FlowAction::NoAction,
 	};
 }
 
-PluginExportResult BurstStatsPlugin::onExport(const FlowRecord& flowRecord, void* pluginContext)
+PluginExportResult BurstStatsPlugin::onExport(const FlowRecord& flowRecord, [[maybe_unused]] void* pluginContext)
 {
 	const uint32_t packetsTotal
 		= static_cast<uint32_t>(

src/plugins/process/bstats/src/burstStats.hpp

@@ -91,7 +91,7 @@ class BurstStatsPlugin : public ProcessPlugin {
 private:
 	constexpr static std::size_t MINIMAL_PACKETS_COUNT = 3; ///< Minimal number of packets to consider the flow valid.
 
-	void updateBursts(Burst& burst, FlowRecord& flowRecord, const Packet& packet) noexcept;
+	void updateBursts(Burst& burst, const Packet& packet) noexcept;
 	void makeAllFieldsUnavailable(FlowRecord& flowRecord) noexcept; 
 
 	FieldHandlers<BurstStatsFields> m_fieldHandlers;

src/plugins/process/common/dnsParser/dnsName.cpp

@@ -38,7 +38,6 @@ constexpr static std::size_t calculateElementsLength(auto&& container) noexcept
         });
 }
 
-constexpr
 std::optional<DNSName> DNSName::createFrom(
     std::span<const std::byte> payload, 
     std::span<const std::byte> fullDNSpayload) noexcept

src/plugins/process/common/dnsParser/dnsName.hpp

@@ -17,7 +17,7 @@ namespace ipxp
 class DNSName {
 public:
 
-    constexpr static
+    static
     std::optional<DNSName> createFrom(
         std::span<const std::byte> payload, 
         std::span<const std::byte> fullDNSpayload) noexcept;
@@ -34,7 +34,7 @@ class DNSName {
      * @return Length of DNS name excluding length of data pointed by DNS pointer
      * i.e after that count of bytes there is DNS question type field
      */
-    constexpr std::size_t length() const noexcept;
+    std::size_t length() const noexcept;
 
     bool operator==(const DNSName& other) const noexcept;
 

src/plugins/process/common/dnsParser/dnsParser.cpp

@@ -77,7 +77,7 @@ std::optional<DNSHeader> parseHeader(std::span<const std::byte> payload) noexcep
 	return *reinterpret_cast<const DNSHeader*>(payload.data());
 }
 
-constexpr bool DNSParser::parse(
+bool DNSParser::parse(
     std::span<const std::byte> payload, const bool isDNSOverTCP,
     const std::function<bool(const DNSQuestion& query)>& queryCallback,
     const std::function<bool(const DNSRecord& answer)>& answerCallback,

src/plugins/process/common/dnsParser/dnsParser.hpp

@@ -27,20 +27,20 @@ namespace ipxp {
  * @brief DNS parser class
  */
 class DNSParser {
-
+    constexpr static auto EMPTY_QUERY_CALLBACK = [](const DNSQuestion&) { return true; };
+    constexpr static auto EMPTY_RECORD_CALLBACK = [](const DNSRecord&) { return true; };
 public:
 	/**
 	 * @brief Parse given DNS packet
 	 * @param dnsData DNS packet data
 	 * @param isDnsOverTCP Flag indicating if the DNS packet is over TCP
 	 * @return True of parsed successfully, false otherwise
 	 */
-	constexpr bool parse(
-    std::span<const std::byte> payload, const bool isDnsOverTCP,
-    const std::function<bool(const DNSQuestion& query)>& queryCallback,
-    const std::function<bool(const DNSRecord& answer)>& answerCallback,
-    const std::function<bool(const DNSRecord& authorityRecord)>& authorityCallback,
-    const std::function<bool(const DNSRecord& additionalRecord)>& additionalCallback) noexcept;
+	bool parse(std::span<const std::byte> payload, const bool isDnsOverTCP,
+    const std::function<bool(const DNSQuestion& query)>& queryCallback = EMPTY_QUERY_CALLBACK,
+    const std::function<bool(const DNSRecord& answer)>& answerCallback = EMPTY_RECORD_CALLBACK,
+    const std::function<bool(const DNSRecord& authorityRecord)>& authorityCallback = EMPTY_RECORD_CALLBACK,
+    const std::function<bool(const DNSRecord& additionalRecord)>& additionalCallback = EMPTY_RECORD_CALLBACK) noexcept;
 
     uint16_t answersCount;
     uint16_t id;
@@ -50,7 +50,6 @@ class DNSParser {
 	std::optional<OPTRecord> firstOPTRecord;
     std::span<const std::byte> fullDNSPayload;
 
-
 private:
 
 	constexpr std::optional<std::size_t> parseQuestionSection(

src/plugins/process/common/dnsParser/dnsQuestion.hpp

@@ -1,6 +1,9 @@
 #pragma once
 
+#include <cstdint>
+
 #include "dnsQueryType.hpp"
+#include "dnsName.hpp"
 
 namespace ipxp
 {

src/plugins/process/common/dnsParser/dnsRecordPayloadTypes/dnsHINFORecord.hpp

@@ -16,7 +16,7 @@ struct DNSHINFORecord {
     DNSName cpu;
     DNSName operatingSystem;
 
-    constexpr static std::optional<DNSHINFORecord> createFrom(
+    static std::optional<DNSHINFORecord> createFrom(
         std::span<const std::byte> payload,
         std::span<const std::byte> fullDNSPayload) noexcept
     {

src/plugins/process/common/dnsParser/dnsRecordPayloadTypes/dnsISDNRecord.hpp

@@ -16,7 +16,7 @@ struct DNSISDNRecord {
     DNSName isdnAddress;
     DNSName subaddress;
 
-    constexpr static std::optional<DNSISDNRecord> createFrom(
+    static std::optional<DNSISDNRecord> createFrom(
         std::span<const std::byte> payload,
         std::span<const std::byte> fullDNSPayload) noexcept
     {