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

Check return values of ENet functions when sending packet.
dolphin-emu · Oct 9, 2022 · e288786 · e288786
2 parents 5f3e8e0 + bfbc04e
commit e288786
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git 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
 {
@@ -35,4 +36,24 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
   }
   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
diff --git a/Source/Core/Common/ENetUtil.h b/Source/Core/Common/ENetUtil.h
@@ -5,8 +5,13 @@
 
 #include <enet/enet.h>
 
+#include <SFML/Network/Packet.hpp>
+
+#include "Common/CommonTypes.h"
+
 namespace ENetUtil
 {
 void WakeupThread(ENetHost* host);
 int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
+bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id);
 }  // namespace ENetUtil
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
@@ -1465,9 +1465,7 @@ void NetPlayClient::OnGameDigestAbort()
 
 void NetPlayClient::Send(const sf::Packet& packet, const u8 channel_id)
 {
-  ENetPacket* epac =
-      enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
-  enet_peer_send(m_server, channel_id, epac);
+  ENetUtil::SendPacket(m_server, packet, channel_id);
 }
 
 void NetPlayClient::DisplayPlayersPing()

diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
@@ -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)
 {
-  ENetPacket* epac =
-      enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
-  enet_peer_send(socket, channel_id, epac);
+  ENetUtil::SendPacket(socket, packet, channel_id);
 }
 
 void NetPlayServer::KickPlayer(PlayerId player)