Persson-dev/Simple-Protocol-Lib
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

change decapsulate signature

Browse Source
This commit is contained in:
Simon Pribylski
2025-03-01 19:19:27 +01:00
parent e8441205a4
commit 5a3197d3de
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sp/extensions/Compress.h
View File

@@ -47,7 +47,7 @@ template <>
class MessageEncapsulator<option::ZlibCompress> { class MessageEncapsulator<option::ZlibCompress> {
public: public:
static DataBuffer Encapsulate(const DataBuffer& a_Data, const option::ZlibCompress& a_Option); static DataBuffer Encapsulate(const DataBuffer& a_Data, const option::ZlibCompress& a_Option);
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const option::ZlibCompress& a_Option); static DataBuffer Decapsulate(DataBuffer& a_Data, const option::ZlibCompress& a_Option);
}; };
} // namespace io } // namespace io

4
include/sp/io/IOInterface.h
View File

@@ -17,7 +17,7 @@ template <typename TOption>
class MessageEncapsulator { class MessageEncapsulator {
public: public:
static DataBuffer Encapsulate(const DataBuffer& a_Data, const TOption& a_Option); static DataBuffer Encapsulate(const DataBuffer& a_Data, const TOption& a_Option);
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOption& a_Option); static DataBuffer Decapsulate(DataBuffer& a_Data, const TOption& a_Option);
}; };
template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions> template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions>
@@ -49,7 +49,7 @@ class Stream {
private: private:
static DataBuffer Encapsulate(const DataBuffer& a_Data, const TOptions&... a_Options); static DataBuffer Encapsulate(const DataBuffer& a_Data, const TOptions&... a_Options);
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOptions&... a_Options); static DataBuffer Decapsulate(DataBuffer& a_Data, const TOptions&... a_Options);
}; };
} // namespace io } // namespace io

14
include/sp/io/IOInterfaceImpl.inl
View File

@@ -15,7 +15,7 @@ struct MessageEncapsulatorPack<> {
static DataBuffer Encapsulate(const DataBuffer& a_Data) { static DataBuffer Encapsulate(const DataBuffer& a_Data) {
return a_Data; return a_Data;
} }
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length) { static DataBuffer Decapsulate(DataBuffer& a_Data) {
return a_Data; return a_Data;
} }
}; };
@@ -26,9 +26,9 @@ struct MessageEncapsulatorPack<TOption, TOptions...> {
DataBuffer data = io::MessageEncapsulator<TOption>::Encapsulate(a_Data, a_Option); DataBuffer data = io::MessageEncapsulator<TOption>::Encapsulate(a_Data, a_Option);
return MessageEncapsulatorPack<TOptions...>::Encapsulate(data, a_Options...); return MessageEncapsulatorPack<TOptions...>::Encapsulate(data, a_Options...);
} }
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOption& a_Option, const TOptions&... a_Options) { static DataBuffer Decapsulate(DataBuffer& a_Data, const TOption& a_Option, const TOptions&... a_Options) {
DataBuffer data = io::MessageEncapsulator<TOption>::Decapsulate(a_Data, a_Length, a_Option); DataBuffer data = io::MessageEncapsulator<TOption>::Decapsulate(a_Data, a_Option);
return MessageEncapsulatorPack<TOptions...>::Decapsulate(data, data.GetSize(), a_Options...); return MessageEncapsulatorPack<TOptions...>::Decapsulate(data, a_Options...);
} }
}; };
@@ -94,7 +94,7 @@ void Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::RecieveMessa
buffer = m_Interface.Read(lenghtValue); buffer = m_Interface.Read(lenghtValue);
buffer = std::apply([&buffer, lenghtValue](const auto&... a_Options) { buffer = std::apply([&buffer, lenghtValue](const auto&... a_Options) {
return Decapsulate(buffer, lenghtValue, a_Options...); return Decapsulate(buffer, a_Options...);
}, m_Options); }, m_Options);
VarInt packetType; VarInt packetType;
@@ -120,8 +120,8 @@ DataBuffer Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::Encaps
template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions> template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions>
DataBuffer Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::Decapsulate( DataBuffer Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::Decapsulate(
DataBuffer& a_Data, std::size_t a_Length, const TOptions&... a_Options) { DataBuffer& a_Data, const TOptions&... a_Options) {
return details::MessageEncapsulatorPack<TOptions...>::Decapsulate(a_Data, a_Length, a_Options...); return details::MessageEncapsulatorPack<TOptions...>::Decapsulate(a_Data, a_Options...);
} }
} // namespace io } // namespace io

5
src/sp/extensions/Compress.cpp
View File

@@ -81,9 +81,8 @@ DataBuffer MessageEncapsulator<option::ZlibCompress>::Encapsulate(const DataBuff
return zlib::Compress(a_Data, a_Option.m_Enabled ? a_Option.m_CompressionThreshold : MAX_COMPRESS_THRESHOLD); return zlib::Compress(a_Data, a_Option.m_Enabled ? a_Option.m_CompressionThreshold : MAX_COMPRESS_THRESHOLD);
} }
DataBuffer MessageEncapsulator<option::ZlibCompress>::Decapsulate( DataBuffer MessageEncapsulator<option::ZlibCompress>::Decapsulate(DataBuffer& a_Data, const option::ZlibCompress& a_Option) {
DataBuffer& a_Data, std::size_t a_Length, const option::ZlibCompress& a_Option) { return zlib::Decompress(a_Data, a_Data.GetSize());
return zlib::Decompress(a_Data, a_Length);
} }
} // namespace io } // namespace io