++

Damir Zainullin · Damir Zainullin · commit c1822f673a3b · 2025-08-20T11:47:16.000+02:00
diff --git a/process-plugin-api/process/common/dnsParser/dnsParser.o b/process-plugin-api/process/common/dnsParser/dnsParser.o
diff --git a/process-plugin-api/process/common/dnsParser/dnsSectionReader.hpp b/process-plugin-api/process/common/dnsParser/dnsSectionReader.hpp
@@ -5,6 +5,7 @@
 #include <optional>
 #include <readers/rangeReader/rangeReader.hpp>
 #include <readers/rangeReader/generator.hpp>
+#include <readers/rangeReader/functionTraits.hpp>
 
 #include "dnsRecord.hpp"
 
@@ -19,14 +20,14 @@ struct DNSSectionReaderFactory
         std::size_t itemCount, 
         std::span<const std::byte> fullDNSPayload,
         std::span<const std::byte> section,
-        ParsingState* parsingState
+        ParsingState& parsingState
     ) noexcept
     {
         return Generator::generate([section, itemCount, fullDNSPayload, parsingState]() mutable
         -> std::optional<DNSRecord> {
             auto res = std::make_optional<DNSRecord>();
             if (itemCount == 0) {
-                parsingState->state = ParsingState::State::SUCCESS;
+                parsingState.state = ParsingState::State::SUCCESS;
                 return std::nullopt;
             }
             itemCount--;
@@ -84,9 +85,11 @@ class DNSSectionReader : public RangeReader<DNSSectionReaderFactory> {
         : RangeReader(section, DNSSectionReaderFactory{this, itemCount, fullDNSPayload.data()}) {}
 };*/
 
+using Ret = FunctionTraits<decltype(
+        &DNSSectionReaderFactory::makeReader)>::ReturnType;
+
 class DNSSectionReader : 
-    public RangeReader<decltype(
-        DNSSectionReaderFactory::makeReader({}, {}, {}, {}))> {
+    public RangeReader<Ret> {
 
 public:
     DNSSectionReader(
@@ -95,7 +98,7 @@ class DNSSectionReader :
         std::span<const std::byte> section)
         : RangeReader(
             DNSSectionReaderFactory::makeReader(
-                itemCount, fullDNSPayload, section, &m_state))
+                itemCount, fullDNSPayload, section, m_state))
     {
     }
     
diff --git a/process-plugin-api/process/common/readers/rangeReader/functionTraits.hpp b/process-plugin-api/process/common/readers/rangeReader/functionTraits.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+namespace ipxp
+{
+    
+template<typename Function>
+struct FunctionTraits;
+
+template<typename R, typename... Args>
+struct FunctionTraits<R(*)(Args...)> {
+    using ReturnType = R;
+};
+
+} // namespace ipxp
diff --git a/process-plugin-api/process/common/readers/rangeReader/generator.hpp b/process-plugin-api/process/common/readers/rangeReader/generator.hpp
@@ -2,10 +2,15 @@
 
 #include <ranges>
 
-namespace ipxp::Generator
+namespace ipxp
 {
 
 // no std::ranges::generate in c++20(from c++23)
+
+template<typename GeneratorCallback>
+class Generator {
+public:
+
 constexpr static
 auto generate(auto generator) noexcept
 {
@@ -15,4 +20,6 @@ auto generate(auto generator) noexcept
            });
 }
 
+};
+
 } // namespace ipxp
diff --git a/process-plugin-api/process/common/tlsParser/extensionReaders/extensionReader.hpp b/process-plugin-api/process/common/tlsParser/extensionReaders/extensionReader.hpp
@@ -1,26 +1,24 @@
 
 #include <span>
-#include <views>
+#include <ranges>
 #include <optional>
-#include <rangeReader/rangeReader.hpp>
-#include <rangeReader/generator.hpp>
+#include <readers/rangeReader/rangeReader.hpp>
+#include <readers/rangeReader/generator.hpp>
 
-#include "../tlsExtensionType.hpp"
+#include "../tlsExtension.hpp"
 
 namespace ipxp
 {
 
-struct Extension {
-    ExtensionType type;
-    std::span<const std::byte> payload;
-};
+
 
 class ExtensionReader;
 
 struct ExtensionReaderFactory {
-    ExtensionReader* self;
 
-    auto operator()(std::span<const std::byte> payload) const {
+    static auto operator()(
+        std::span<const std::byte> payload
+    ) noexcept {
         return Generator::generate([payload, self = self](int) mutable -> std::optional<Extension> {
             if (payload.empty()) {
                 self->setSuccess();
diff --git a/process-plugin-api/process/common/tlsParser/tlsExtension.hpp b/process-plugin-api/process/common/tlsParser/tlsExtension.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <cstdint>
+#include <span>
+
+#include "tlsExtensionType.hpp"
+
+namespace ipxp
+{
+    
+struct TLSExtension {
+    TLSExtensionType type;
+    std::span<const std::byte> payload;
+};
+
+} // namespace ipxp
diff --git a/process-plugin-api/process/common/tlsParser/tlsExtensionType.hpp b/process-plugin-api/process/common/tlsParser/tlsExtensionType.hpp
@@ -16,6 +16,6 @@ enum class TLSExtensionType : uint16_t
     QUIC_TRANSPORT_PARAMETERS = 0xffa5,
     QUIC_TRANSPORT_PARAMETERS_V1 = 0x39,
     QUIC_TRANSPORT_PARAMETERS_V2 = 0x26
-}
+};
 
-} // namespace ipxp::tls
+} // namespace ipxp
diff --git a/process-plugin-api/process/common/tlsParser/tlsHandshake.hpp b/process-plugin-api/process/common/tlsParser/tlsHandshake.hpp
@@ -16,7 +16,7 @@ struct TLSHandshake {
 	Type type;
 	uint8_t length1; // length field is 3 bytes long...
 	uint16_t length2;
-	Version version;
+	TLSVersion version;
 
 	/* Handshake data... */
 } __attribute__((packed));
diff --git a/process-plugin-api/process/common/tlsParser/tlsHeader.hpp b/process-plugin-api/process/common/tlsParser/tlsHeader.hpp
@@ -11,7 +11,7 @@ struct TLSHeader {
     };
 
     Type type;
-	Version version;
+	TLSVersion version;
 	uint16_t length;
 	/* Record data... */
 
diff --git a/process-plugin-api/process/common/tlsParser/tlsParser.cpp b/process-plugin-api/process/common/tlsParser/tlsParser.cpp
@@ -19,9 +19,9 @@
 
 #include <utils/spanUtils.hpp>
 
-#include "tlsCipherSuite.hpp"
+//#include "tlsCipherSuite.hpp"
 #include "tlsHeader.hpp"
-#include "tlsHandshakeHeader.hpp"
+#include "tlsHandshake.hpp"
 #include "extensionReaders/extensionReader.hpp"
 
 
diff --git a/process-plugin-api/process/common/tlsParser/tlsParser.hpp b/process-plugin-api/process/common/tlsParser/tlsParser.hpp
@@ -16,21 +16,29 @@
 #include <optional>
 #include <string_view>
 #include <vector>
+#include <span>
+#include <boost/container/static_vector.hpp>
+#include <boost/static_string.hpp>
+#include <functional>
+
+#include "tlsHandshake.hpp"
+#include "tlsVersion.hpp"
+#include "tlsExtension.hpp"
 
 //#include <ipfixprobe/processPlugin.hpp>
 
-#define TLS_HANDSHAKE_CLIENT_HELLO 1
-#define TLS_HANDSHAKE_SERVER_HELLO 2
+//#define TLS_HANDSHAKE_CLIENT_HELLO 1
+//#define TLS_HANDSHAKE_SERVER_HELLO 2
 //#define TLS_EXT_SERVER_NAME 0
 //#define TLS_EXT_ALPN 16
 // draf-33, draft-34 a rfc9001, have this value defined as 0x39 == 57
-#define TLS_EXT_QUIC_TRANSPORT_PARAMETERS_V1 0x39
+//#define TLS_EXT_QUIC_TRANSPORT_PARAMETERS_V1 0x39
 // draf-13 az draft-32 have this value defined as 0xffa5 == 65445
-#define TLS_EXT_QUIC_TRANSPORT_PARAMETERS 0xffa5
+//#define TLS_EXT_QUIC_TRANSPORT_PARAMETERS 0xffa5
 // draf-02 az draft-12 have this value defined as 0x26 == 38
-#define TLS_EXT_QUIC_TRANSPORT_PARAMETERS_V2 0x26
-#define TLS_EXT_GOOGLE_USER_AGENT 0x3129
-#define MAX_TLS_EXT_LEN 30UL
+//#define TLS_EXT_QUIC_TRANSPORT_PARAMETERS_V2 0x26
+//#define TLS_EXT_GOOGLE_USER_AGENT 0x3129
+//#define MAX_TLS_EXT_LEN 30UL
 
 /*#define TLS_EXT_SERVER_NAME 0
 #define TLS_EXT_ECLIPTIC_CURVES 10 // AKA supported_groups
@@ -41,40 +49,40 @@
 
 namespace ipxp {
 
-#define TLS_HANDSHAKE 22
+//#define TLS_HANDSHAKE 22
 
 
 class TLSParser {
 public:
-	constexpr std::size_t MAX_CIPHER_SUITES = 30;
+	constexpr static std::size_t MAX_CIPHER_SUITES = 30;
 	using CipherSuites 
 		= boost::container::static_vector<uint16_t, TLSParser::MAX_CIPHER_SUITES>;
 
-	constexpr std::size_t MAX_ELLIPTIC_CURVE_POINT_FORMATS = 20;
+	constexpr static std::size_t MAX_ELLIPTIC_CURVE_POINT_FORMATS = 20;
 	using EllipticCurvePointFormats 
 		= boost::container::static_vector<uint8_t, TLSParser::MAX_ELLIPTIC_CURVE_POINT_FORMATS>;
 
-	constexpr std::size_t MAX_SERVER_NAMES = 10; 
+	constexpr static std::size_t MAX_SERVER_NAMES = 10; 
 	using ServerNames 
 		= boost::container::static_vector<std::string_view, TLSParser::MAX_SERVER_NAMES>;
 
-	constexpr std::size_t MAX_USER_AGENTS = 10; 
+	constexpr static std::size_t MAX_USER_AGENTS = 10; 
 	using UserAgents
 		= boost::container::static_vector<std::string_view, TLSParser::MAX_USER_AGENTS>;
 
-	constexpr std::size_t MAX_ALPNS = 20;
+	constexpr static std::size_t MAX_ALPNS = 20;
 	using ALPNs
 		= boost::container::static_vector<std::string_view, TLSParser::MAX_ALPNS>;
 
-	constexpr std::size_t MAX_SIGNATURE_ALGORITHMS = 10;
+	constexpr static std::size_t MAX_SIGNATURE_ALGORITHMS = 10;
 	using SignatureAlgorithms
 		= boost::container::static_vector<uint16_t, TLSParser::MAX_SIGNATURE_ALGORITHMS>;
 
-	constexpr std::size_t MAX_SUPPORTED_VERSIONS = 20;
+	constexpr static std::size_t MAX_SUPPORTED_VERSIONS = 20;
 	using SupportedVersions 
 		= boost::container::static_vector<uint16_t, TLSParser::MAX_SUPPORTED_VERSIONS>;
 
-	constexpr std::size_t MAX_SUPPORTED_GROUPS = 20;
+	constexpr static std::size_t MAX_SUPPORTED_GROUPS = 20;
 	using SupportedGroups
 		= boost::container::static_vector<uint16_t, TLSParser::MAX_SUPPORTED_GROUPS>;
 
@@ -85,7 +93,7 @@ class TLSParser {
 	constexpr bool parseHelloFromQUIC(std::span<const std::byte> payload) noexcept;
 
 	constexpr bool parseExtensions(
-		const std::function<bool(const Extension&)>& callable) noexcept;
+		const std::function<bool(const TLSExtension&)>& callable) noexcept;
 
 	constexpr static
 	std::optional<ServerNames>
@@ -105,7 +113,7 @@ class TLSParser {
 
 	constexpr static
 	std::optional<TLSParser::ALPNs>
-	TLSParser::parseALPN(std::span<const std::byte> extension) noexcept;
+	parseALPN(std::span<const std::byte> extension) noexcept;
 
 	constexpr static
 	std::optional<TLSParser::SignatureAlgorithms>
@@ -114,21 +122,20 @@ class TLSParser {
 	constexpr static
 	std::optional<TLSParser::SupportedVersions>
 	parseSupportedVersions(
-		std::span<const std::byte> extension, const HandshakeHeader& handshake) noexcept;
+		std::span<const std::byte> extension, const TLSHandshake& handshake) noexcept;
 
 	constexpr bool isClientHello() const noexcept;
 
 	constexpr bool isServerHello() const noexcept;
 
-	constexpr const HandshakeHeader& getHandshake() noexcept;
+	constexpr const TLSHandshake& getHandshake() noexcept;
 
 	constexpr const CipherSuites& getCipherSuites() const noexcept;
 
-private:
 	constexpr bool parse(
 		std::span<const std::byte> payload, const bool isQUIC) noexcept;
 
-	std::optional<TLSHandshakeHeader> m_handshake;
+	std::optional<TLSHandshake> handshake;
 	std::optional<CipherSuites> m_cipherSuites;
 
 	std::optional<std::span<const std::byte>> m_extensions;

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,15 @@`
`2`	`2`
`3`	`3`	`#include <ranges>`
`4`	`4`
`5`		`-namespace ipxp::Generator`
	`5`	`+namespace ipxp`
`6`	`6`	`{`
`7`	`7`
`8`	`8`	`// no std::ranges::generate in c++20(from c++23)`
	`9`	`+`
	`10`	`+template<typename GeneratorCallback>`
	`11`	`+class Generator {`
	`12`	`+public:`
	`13`	`+`
`9`	`14`	`constexpr static`
`10`	`15`	`auto generate(auto generator) noexcept`
`11`	`16`	`{`
`@@ -15,4 +20,6 @@ auto generate(auto generator) noexcept`
`15`	`20`	`});`
`16`	`21`	`}`
`17`	`22`
	`23`	`+};`
	`24`	`+`
`18`	`25`	`} // namespace ipxp`