++

Author: Damir Zainullin

process-plugin-api/process/common/dnsParser/dnsSectionReader.hpp

@@ -3,6 +3,8 @@
 #include <span>
 #include <ranges>
 #include <optional>
+#include <tuple>
+
 #include <readers/rangeReader/rangeReader.hpp>
 #include <readers/rangeReader/generator.hpp>
 #include <readers/rangeReader/functionTraits.hpp>
@@ -85,8 +87,12 @@ class DNSSectionReader : public RangeReader<DNSSectionReaderFactory> {
         : RangeReader(section, DNSSectionReaderFactory{this, itemCount, fullDNSPayload.data()}) {}
 };*/
 
-using Ret = FunctionTraits<decltype(
-        &DNSSectionReaderFactory::makeReader)>::ReturnType;
+using Args = FunctionTraits<decltype(
+            &DNSSectionReaderFactory::makeReader
+        )>::ArgumentTypes;
+
+using Ret = 
+    ReturnType<DNSSectionReaderFactory::makeReader, Args>::Type;
 
 class DNSSectionReader : 
     public RangeReader<Ret> {

process-plugin-api/process/common/readers/rangeReader/functionTraits.hpp

@@ -8,7 +8,21 @@ struct FunctionTraits;
 
 template<typename R, typename... Args>
 struct FunctionTraits<R(*)(Args...)> {
-    using ReturnType = R;
+    using ArgumentTypes = std::tuple<Args...>;
+
+    /*using ReturnType = decltype(
+        std::declval<R(*)(Args...)>()(std::declval<Args>()...)
+    );*/
+};
+
+template<typename Func, typename Tuple>
+struct ReturnType;
+
+template<typename Func, typename... Args>
+struct ReturnType<Func, std::tuple<Args...>> {
+    using Type = std::invoke_result_t<Func, Args...>;
 };
 
+
+
 } // namespace ipxp

process-plugin-api/process/common/readers/rangeReader/generator.hpp

@@ -7,7 +7,6 @@ namespace ipxp
 
 // no std::ranges::generate in c++20(from c++23)
 
-template<typename GeneratorCallback>
 class Generator {
 public: