From 66684a392f15344845368e880cfbe421f6e9af38 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 9 Oct 2022 02:25:28 +0200 Subject: Deduplicate NetPlayServer::Send() and NetPlayClient::Send() into ENetUtil::SendPacket(). --- Source/Core/Common/ENetUtil.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Source/Core/Common/ENetUtil.cpp') diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp index 646e7f5439..e450ee65d1 100644 --- a/Source/Core/Common/ENetUtil.cpp +++ b/Source/Core/Common/ENetUtil.cpp @@ -35,4 +35,11 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event) } return 0; } + +void SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id) +{ + ENetPacket* epac = + enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE); + enet_peer_send(socket, channel_id, epac); +} } // namespace ENetUtil -- cgit v1.2.3 From bfbc04ef5ec6bc51a931108456e174ec2f291155 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 9 Oct 2022 02:39:38 +0200 Subject: ENetUtil: Check return values of ENet functions in SendPacket(). --- Source/Core/Common/ENetUtil.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/ENetUtil.cpp') diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp index e450ee65d1..d06de7c82a 100644 --- a/Source/Core/Common/ENetUtil.cpp +++ b/Source/Core/Common/ENetUtil.cpp @@ -4,6 +4,7 @@ #include "Common/ENetUtil.h" #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" namespace ENetUtil { @@ -36,10 +37,23 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event) return 0; } -void SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id) +bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id) { ENetPacket* epac = enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE); - enet_peer_send(socket, channel_id, epac); + if (!epac) + { + ERROR_LOG_FMT(NETPLAY, "Failed to create ENetPacket ({} bytes).", packet.getDataSize()); + return false; + } + + const int result = enet_peer_send(socket, channel_id, epac); + if (result != 0) + { + ERROR_LOG_FMT(NETPLAY, "Failed to send ENetPacket (error code {}).", result); + return false; + } + + return true; } } // namespace ENetUtil -- cgit v1.2.3