mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make requirements sufficient in StunClient

Browse Source 
While std::is_pod is required it is not sufficient so use
std::is_integral as condition which is.

Further replace the static_assert with a requires and use the new endian
support to avoid use preprocessor.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2025-07-31 19:19:06 +02:00
parent 65d0561d70
commit 0368a1b391
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/network/StunClient.cpp
+18 -18
View File
@@ -27,8 +27,10 @@
#include "ps/CStr.h"
#include "ps/ConfigDB.h"
#include <bit>
#include <cerrno>
#include <chrono>
#include <concepts>
#include <cstddef>
#include <cstdlib>
#include <cstring>
@@ -82,43 +84,41 @@ ENetAddress m_StunServer;
ENetAddress m_PublicAddress;
/**
* Push POD data to a network-byte-order buffer.
* TODO: this should be optimised & moved to byte_order.h
* Push integral type to a network-byte-order buffer.
*/
template<typename T, size_t n = sizeof(T)>
template<std::integral T, size_t n = sizeof(T)>
void AddToBuffer(std::vector<u8>& buffer, const T value)
{
static_assert(std::is_standard_layout_v<T> && std::is_trivial_v<T>, "T must be POD");
buffer.reserve(buffer.size() + n);
// std::byte* can alias anything so this is legal.
const std::byte* ptr = reinterpret_cast<const std::byte*>(&value);
for (size_t a = 0; a < n; ++a)
#if BYTE_ORDER == LITTLE_ENDIAN
buffer.push_back(static_cast<u8>(*(ptr + n - 1 - a)));
#else
buffer.push_back(static_cast<u8>(*(ptr + a)));
#endif
{
if constexpr (std::endian::native == std::endian::little)
buffer.push_back(static_cast<u8>(*(ptr + n - 1 - a)));
else
buffer.push_back(static_cast<u8>(*(ptr + a)));
}
}
/**
* Read POD data from a network-byte-order buffer.
* TODO: this should be optimised & moved to byte_order.h
* Read integral type from a network-byte-order buffer.
*/
template<typename T, size_t n = sizeof(T)>
template<std::integral T, size_t n = sizeof(T)>
bool GetFromBuffer(const std::vector<u8>& buffer, u32& offset, T& result)
{
static_assert(std::is_standard_layout_v<T> && std::is_trivial_v<T>, "T must be POD");
if (offset + n > buffer.size())
return false;
// std::byte* can alias anything so this is legal.
std::byte* ptr = reinterpret_cast<std::byte*>(&result);
for (size_t a = 0; a < n; ++a)
#if BYTE_ORDER == LITTLE_ENDIAN
*ptr++ = static_cast<std::byte>(buffer[offset + n - 1 - a]);
#else
*ptr++ = static_cast<std::byte>(buffer[offset + a]);
#endif
{
if constexpr (std::endian::native == std::endian::little)
*ptr++ = static_cast<std::byte>(buffer[offset + n - 1 - a]);
else
*ptr++ = static_cast<std::byte>(buffer[offset + a]);
}
offset += n;
return true;