mosskoi/Champions-Reborn-Server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: min code change linux support

Browse Source
This commit is contained in:
mk
2025-11-03 21:03:17 -03:00
parent 777a006792
commit 8d424b7210
19 changed files with 374 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Lobby Server/LobbyServer.cpp
View File

@@ -12,6 +12,11 @@
#include "../../configuration.h"
#include "../../logging.h"
#ifdef __linux__
#include <cerrno>
#include <sys/socket.h>
#endif
LobbyServer::LobbyServer()
{
m_running = false;
@@ -144,8 +149,14 @@ sptr_socket LobbyServer::OpenListenerSocket( std::string ip, int32_t port, Realm
void LobbyServer::Run()
{
#ifdef __linux__
fd_set readSet;
fd_set writeSet;
#endif
#if defined(_WIN32) || defined(WIN32)
FD_SET readSet;
FD_SET writeSet;
#endif
timeval timeout = { 0, 1000 };
@@ -255,7 +266,12 @@ void LobbyServer::CheckSocketProblem()
void LobbyServer::AcceptConnection( sptr_socket srcSocket )
{
sockaddr_in clientInfo{};
#ifdef __linux__
socklen_t addrSize = sizeof(clientInfo);
#endif
#if defined(_WIN32) || defined(WIN32)
int32_t addrSize = sizeof( clientInfo );
#endif
SOCKET clientSocket = accept( srcSocket->fd, ( SOCKADDR * )&clientInfo, &addrSize );
if( clientSocket == INVALID_SOCKET )
@@ -293,7 +309,12 @@ void LobbyServer::ReadSocket( sptr_socket socket )
if( bytesReceived == SOCKET_ERROR )
{
Log::Info( "Socket Error [{}].", WSAGetLastError() );
#if defined(_WIN32) || defined(WIN32)
Log::Info( "Socket Error [{}].", WSAGetLastError() );
#endif
#ifdef __linux__
Log::Info( "Socket Error [{}].", strerror(errno) );
#endif
socket->flag.disconnected_forced = true;
return;
}
@@ -369,8 +390,14 @@ void LobbyServer::WriteSocket( sptr_socket socket )
if( bytesSent == SOCKET_ERROR )
{
const int err = WSAGetLastError();
if( err == WSAEWOULDBLOCK )
#if defined(_WIN32) || defined(WIN32)
const int err = WSAGetLastError();
#endif
#ifdef __linux__
const int err = errno;
#endif
if( err == WSAEWOULDBLOCK )
break;
Log::Error( "Send failed: {}", err );

22
Lobby Server/LobbyServer.h
View File

@@ -8,8 +8,28 @@
#include <string>
#include <array>
#if defined(_WIN32) || defined(WIN32)
#include <winsock2.h>
#include <ws2tcpip.h>
#endif
#ifdef __linux__
#define SOCKET int
#define INVALID_SOCKET -1
#define SOCKET_ERROR -1
#define WSAEWOULDBLOCK EWOULDBLOCK
#define SOCKADDR sockaddr
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#define closesocket(s) close(s)
#define InetPtonA(inet, ip, service_addr) inet_pton(inet, ip, service_addr)
#define InetNtopA(inet, client_ip, remote_ip, size) \
inet_ntop(inet, client_ip, remote_ip, size)
#define WSASocket(inet, stream, ipproto_tcp, protocol_info, group, flags) \
socket(inet, stream, ipproto_tcp)
#endif
#include "../Common/Constant.h"
#include "../Common/ByteStream.h"
@@ -56,4 +76,4 @@ private:
void ReadSocket( sptr_socket socket );
void WriteSocket( sptr_socket socket );
void HandleRequest( sptr_socket socket, sptr_byte_stream stream );
};
};