ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11145 from AdmiralCurtiss/send-packet-check 

Check return values of ENet functions when sending packet.
This commit is contained in:
JMC47 2022-10-08 21:04:14 -04:00 committed by GitHub
parent 5f3e8e0f05 bfbc04ef5e
commit e28878616f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Common/ENetUtil.cpp
View File

@ -4,6 +4,7 @@
#include "Common/ENetUtil.h" #include "Common/ENetUtil.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
namespace ENetUtil namespace ENetUtil
{ {
@ -35,4 +36,24 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
} }
return 0; return 0;
} }
bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id)
{
ENetPacket* epac =
enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
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 } // namespace ENetUtil

5
Source/Core/Common/ENetUtil.h
View File

@ -5,8 +5,13 @@
#include <enet/enet.h> #include <enet/enet.h>
#include <SFML/Network/Packet.hpp>
#include "Common/CommonTypes.h"
namespace ENetUtil namespace ENetUtil
{ {
void WakeupThread(ENetHost* host); void WakeupThread(ENetHost* host);
int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event); int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id);
} // namespace ENetUtil } // namespace ENetUtil

4
Source/Core/Core/NetPlayClient.cpp
View File

@ -1465,9 +1465,7 @@ void NetPlayClient::OnGameDigestAbort()
void NetPlayClient::Send(const sf::Packet& packet, const u8 channel_id) void NetPlayClient::Send(const sf::Packet& packet, const u8 channel_id)
{ {
ENetPacket* epac = ENetUtil::SendPacket(m_server, packet, channel_id);
enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(m_server, channel_id, epac);
} }
void NetPlayClient::DisplayPlayersPing() void NetPlayClient::DisplayPlayersPing()

4
Source/Core/Core/NetPlayServer.cpp
View File

@ -2008,9 +2008,7 @@ void NetPlayServer::SendToClients(const sf::Packet& packet, const PlayerId skip_
void NetPlayServer::Send(ENetPeer* socket, const sf::Packet& packet, const u8 channel_id) void NetPlayServer::Send(ENetPeer* socket, const sf::Packet& packet, const u8 channel_id)
{ {
ENetPacket* epac = ENetUtil::SendPacket(socket, packet, channel_id);
enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(socket, channel_id, epac);
} }
void NetPlayServer::KickPlayer(PlayerId player) void NetPlayServer::KickPlayer(PlayerId player)