Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibGUI: Cleanup packet {,de}serialization

Browse Source
This commit is contained in:
Bananymous
2026-04-15 21:52:13 +03:00
parent eff6c79e9e
commit ce318c7930
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
userspace/libraries/LibGUI/include/LibGUI/Packet.h
View File

@@ -35,9 +35,6 @@
#define DEFINE_PACKET_EXTRA(name, extra, ...) \ #define DEFINE_PACKET_EXTRA(name, extra, ...) \
struct name \ struct name \
{ \ { \
static constexpr PacketType type = PacketType::name; \
static constexpr uint32_t type_u32 = static_cast<uint32_t>(type); \
\
extra; \ extra; \
\ \
FOR_EACH(FIELD_DECL, __VA_ARGS__) \ FOR_EACH(FIELD_DECL, __VA_ARGS__) \
@@ -45,8 +42,7 @@
size_t serialized_size() const \ size_t serialized_size() const \
{ \ { \
size_t serialized_size = 0; \ size_t serialized_size = 0; \
serialized_size += Serialize::serialized_size_impl<uint32_t>(0); \ serialized_size += Serialize::serialized_size_impl(PacketHeader {}); \
serialized_size += Serialize::serialized_size_impl<uint32_t>(type_u32); \
FOR_EACH(ADD_SERIALIZED_SIZE, __VA_ARGS__) \ FOR_EACH(ADD_SERIALIZED_SIZE, __VA_ARGS__) \
return serialized_size; \ return serialized_size; \
} \ } \
@@ -54,16 +50,17 @@
void serialize(BAN::ByteSpan buffer) const \ void serialize(BAN::ByteSpan buffer) const \
{ \ { \
const uint32_t serialized_size = this->serialized_size(); \ const uint32_t serialized_size = this->serialized_size(); \
Serialize::serialize_impl<uint32_t>(buffer, serialized_size); \ Serialize::serialize_impl(buffer, PacketHeader { \
Serialize::serialize_impl<uint32_t>(buffer, type_u32); \ .size = serialized_size, \
.type = PacketType::name, \
}); \
FOR_EACH(SERIALIZE, __VA_ARGS__); \ FOR_EACH(SERIALIZE, __VA_ARGS__); \
} \ } \
\ \
static BAN::ErrorOr<name> deserialize(BAN::ConstByteSpan buffer) \ static BAN::ErrorOr<name> deserialize(BAN::ConstByteSpan buffer) \
{ \ { \
const uint32_t size_u32 = TRY(Serialize::deserialize_impl<uint32_t>(buffer)); \ const auto header = TRY(Serialize::deserialize_impl<PacketHeader>(buffer)); \
const uint32_t type_u32 = TRY(Serialize::deserialize_impl<uint32_t>(buffer)); \ if (header.type != PacketType::name || header.size != buffer.size() + sizeof(PacketHeader)) \
if (type_u32 != name::type_u32 || size_u32 != buffer.size() + 2 * sizeof(uint32_t)) \
return BAN::Error::from_errno(EINVAL); \ return BAN::Error::from_errno(EINVAL); \
name value; \ name value; \
FOR_EACH(DESERIALIZE, __VA_ARGS__) \ FOR_EACH(DESERIALIZE, __VA_ARGS__) \