mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Refactor creation of UDP socket

Browse Source
This commit is contained in:
Ted John
2019-05-07 17:55:48 +01:00
parent f8e3abcf4e
commit 73b8310e8e
1 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/openrct2/network/Socket.cpp
View File

@@ -613,29 +613,7 @@ public:
}
// Create the listening socket
_socket = socket(ss.ss_family, SOCK_DGRAM, IPPROTO_UDP);
if (_socket == INVALID_SOCKET)
{
throw SocketException("Unable to create socket.");
}
// Turn off IPV6_V6ONLY so we can accept both v4 and v6 connections
if (!SetOption(_socket, IPPROTO_IPV6, IPV6_V6ONLY, false))
{
log_error("IPV6_V6ONLY failed. %d", LAST_SOCKET_ERROR());
}
if (!SetOption(_socket, SOL_SOCKET, SO_REUSEADDR, true))
{
log_error("SO_REUSEADDR failed. %d", LAST_SOCKET_ERROR());
}
// Enable send and receiving of broadcast messages
if (!SetOption(_socket, SOL_SOCKET, SO_BROADCAST, true))
{
log_error("SO_BROADCAST failed. %d", LAST_SOCKET_ERROR());
}
_socket = CreateSocket();
try
{
// Bind to address:port and listen
@@ -643,11 +621,6 @@ public:
{
throw SocketException("Unable to bind to socket.");
}
if (!SetNonBlocking(_socket, true))
{
throw SocketException("Failed to set non-blocking mode.");
}
}
catch (const std::exception&)
{
@@ -675,22 +648,7 @@ public:
{
if (_socket == INVALID_SOCKET)
{
_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (_socket == INVALID_SOCKET)
{
throw SocketException("Unable to create socket.");
}
// Enable send and receiving of broadcast messages
if (!SetOption(_socket, SOL_SOCKET, SO_BROADCAST, true))
{
log_error("SO_BROADCAST failed. %d", LAST_SOCKET_ERROR());
}
if (!SetNonBlocking(_socket, true))
{
throw SocketException("Failed to set non-blocking mode.");
}
_socket = CreateSocket();
}
const auto& dest = dynamic_cast<const NetworkEndpoint*>(&destination);
@@ -766,6 +724,39 @@ private:
_status = SOCKET_STATUS_CONNECTED;
}
SOCKET CreateSocket()
{
auto sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (sock == INVALID_SOCKET)
{
throw SocketException("Unable to create socket.");
}
// Enable send and receiving of broadcast messages
if (!SetOption(sock, SOL_SOCKET, SO_BROADCAST, true))
{
log_warning("SO_BROADCAST failed. %d", LAST_SOCKET_ERROR());
}
// Turn off IPV6_V6ONLY so we can accept both v4 and v6 connections
if (!SetOption(_socket, IPPROTO_IPV6, IPV6_V6ONLY, false))
{
log_warning("IPV6_V6ONLY failed. %d", LAST_SOCKET_ERROR());
}
if (!SetOption(_socket, SOL_SOCKET, SO_REUSEADDR, true))
{
log_warning("SO_REUSEADDR failed. %d", LAST_SOCKET_ERROR());
}
if (!SetNonBlocking(sock, true))
{
throw SocketException("Failed to set non-blocking mode.");
}
return sock;
}
void CloseSocket()
{
if (_socket != INVALID_SOCKET)