From 359c176b03ddc83e8ed47a6dc4644391e2173692 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Thu, 1 Sep 2022 20:21:27 +0200 Subject: [PATCH] Network/ENetHost: Expose AllocatePacket --- include/Nazara/Network/ENetHost.hpp | 6 +++--- include/Nazara/Network/ENetHost.inl | 16 ++++++++-------- src/Nazara/Network/ENetHost.cpp | 28 ++++++++++++++-------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/Nazara/Network/ENetHost.hpp b/include/Nazara/Network/ENetHost.hpp index 55808d919..178e40eb0 100644 --- a/include/Nazara/Network/ENetHost.hpp +++ b/include/Nazara/Network/ENetHost.hpp @@ -44,6 +44,9 @@ namespace Nz ENetHost(ENetHost&&) = default; inline ~ENetHost(); + ENetPacketRef AllocatePacket(ENetPacketFlags flags); + inline ENetPacketRef AllocatePacket(ENetPacketFlags flags, NetPacket&& data); + inline void AllowsIncomingConnections(bool allow = true); void Broadcast(UInt8 channelId, ENetPacketFlags flags, NetPacket&& packet); @@ -79,9 +82,6 @@ namespace Nz ENetHost& operator=(ENetHost&&) = default; private: - ENetPacketRef AllocatePacket(ENetPacketFlags flags); - inline ENetPacketRef AllocatePacket(ENetPacketFlags flags, NetPacket&& data); - bool InitSocket(const IpAddress& address); void AddToDispatchQueue(ENetPeer* peer); diff --git a/include/Nazara/Network/ENetHost.inl b/include/Nazara/Network/ENetHost.inl index 472fe95a2..0a58248ba 100644 --- a/include/Nazara/Network/ENetHost.inl +++ b/include/Nazara/Network/ENetHost.inl @@ -20,6 +20,14 @@ namespace Nz Destroy(); } + inline ENetPacketRef ENetHost::AllocatePacket(ENetPacketFlags flags, NetPacket&& data) + { + ENetPacketRef ref = AllocatePacket(flags); + ref->data = std::move(data); + + return ref; + } + inline void ENetHost::AllowsIncomingConnections(bool allow) { NazaraAssert(m_address.IsValid() && !m_address.IsLoopback(), "Only server hosts can allow incoming connections"); @@ -101,14 +109,6 @@ namespace Nz m_compressor = std::move(compressor); } - inline ENetPacketRef ENetHost::AllocatePacket(ENetPacketFlags flags, NetPacket&& data) - { - ENetPacketRef ref = AllocatePacket(flags); - ref->data = std::move(data); - - return ref; - } - inline void ENetHost::UpdateServiceTime() { // Compute service time as microseconds for extra precision diff --git a/src/Nazara/Network/ENetHost.cpp b/src/Nazara/Network/ENetHost.cpp index 4a0234b3e..09fe4e961 100644 --- a/src/Nazara/Network/ENetHost.cpp +++ b/src/Nazara/Network/ENetHost.cpp @@ -43,6 +43,20 @@ namespace Nz } + ENetPacketRef ENetHost::AllocatePacket(ENetPacketFlags flags) + { + std::size_t poolIndex; + + ENetPacket* packet = m_packetPool.Allocate(poolIndex); + + ENetPacketRef enetPacket(&m_packetPool, packet); + enetPacket->flags = flags; + enetPacket->poolIndex = poolIndex; + enetPacket.m_pool = &m_packetPool; + + return enetPacket; + } + void ENetHost::Broadcast(UInt8 channelId, ENetPacketFlags flags, NetPacket&& packet) { ENetPacketRef enetPacket = AllocatePacket(flags, std::move(packet)); @@ -310,20 +324,6 @@ namespace Nz } } - ENetPacketRef ENetHost::AllocatePacket(ENetPacketFlags flags) - { - std::size_t poolIndex; - - ENetPacket* packet = m_packetPool.Allocate(poolIndex); - - ENetPacketRef enetPacket(&m_packetPool, packet); - enetPacket->flags = flags; - enetPacket->poolIndex = poolIndex; - enetPacket.m_pool = &m_packetPool; - - return enetPacket; - } - bool ENetHost::InitSocket(const IpAddress& address) { if (!m_socket.Create((m_isUsingDualStack) ? NetProtocol::Any : address.GetProtocol()))