Port server to Linux and add Docker Compose deployment
Rebuilds (not Wine) the login/char/world servers natively for Linux via CMake, and ships a single Docker image plus docker-compose stack (MariaDB + 3 servers) with all settings configurable via .env. Linux portability: - Src/Common/compat.h shims MSVC-only CRT calls (fopen_s, _strdup, strncpy_s, sprintf_s, SYSTEMTIME/GetLocalTime, WSAGetLastError, __cdecl) and adds a case-insensitive/backslash-tolerant path resolver for the Windows-authored STB/AIP data file paths. - Fixed case-sensitive header includes and filenames (charserver.h vs CharServer.h, worldserver.h vs WorldServer.h, ../common vs ../Common). - rose_inet_addr() resolves hostnames (not just literal IPs) for the server-to-server links, so docker-compose service names work. Fixed three real bugs that only crashed on 64-bit Linux (silently tolerated on 32-bit Windows): - CIntStb::LoadSTB had an inverted fopen success/failure check, so STB game data (zones, items, etc.) was never actually loaded. - GenerateCryptTables allocated its pointer table with sizeof(unsigned) instead of sizeof(unsigned*) -- a 1x vs 2x-size heap overflow on 64-bit. - Crypto bit-twiddling relies throughout on signed-overflow-as-wraparound, which is UB in C++; GCC's -O3 exploited it and miscompiled GenerateCryptTables (Release-only crash). Fixed via -fwrapv. Plus smaller fixes: off-by-one array bounds (inventory/storage/sell data), SO_REUSEADDR on server sockets (containers restarting in the same netns hit TIME_WAIT otherwise), and a va_list reused across multiple vprintf/vfprintf calls in Log() that garbled every formatted log line on the Linux ABI. Docker: - CMakeLists.txt builds all three servers + shared Common code. - Dockerfile: multi-stage build, one runtime image for all three servers, server role selected via `command: [login|char|world]`. - docker-compose.yml: MariaDB (auto-imports database sql files/ on first run) + login/char/world (single channel), config rendered from docker/conf/*.conf.tmpl via envsubst at container start. - .env.example documents every setting (ports, server names, rates, inter-server passwords, PUBLIC_HOST for internet-facing deployments). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
a320bbe470
commit
764fcb3b3f
37 files changed
+811
-72
No files matched your search
@@ -405,7 +405,7 @@ bool CCharServer::pakWSReady ( CCharClient* thisclient, CPacket* P )
|
||||
}
|
||||
struct sockaddr_in ain;
|
||||
ain.sin_family = AF_INET;
|
||||
ain.sin_addr.s_addr = inet_addr(newchannel->ip);
|
||||
ain.sin_addr.s_addr = rose_inet_addr(newchannel->ip);
|
||||
ain.sin_port = htons( newchannel->port );
|
||||
memset(&(ain.sin_zero), '\0', 8);
|
||||
if ( connect( newchannel->sock , (SOCKADDR*) &ain, sizeof(ain) ) == SOCKET_ERROR)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#define __ROSE_SERVERS__
|
||||
|
||||
#include <time.h>
|
||||
#include "../common/sockets.h"
|
||||
#include "../Common/sockets.h"
|
||||
#include "datatypes.h"
|
||||
#define ClearItem(i) { i.durability=0; i.itemnum=0; i.itemtype=0; i.lifespan=0; i.refine=0; }
|
||||
using namespace std;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
depeloped with Main erose/hrose source server + some change from the original eich source
|
||||
*/
|
||||
#include "CharServer.h"
|
||||
#include "charserver.h"
|
||||
|
||||
// Send Clan information
|
||||
bool CCharServer::SendClanInfo (CCharClient* thisclient)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
*/
|
||||
#ifndef __ROSE_DATATYPES__
|
||||
#define __ROSE_DATATYPES__
|
||||
#include "../common/sockets.h"
|
||||
#include "../Common/sockets.h"
|
||||
// List of clan members
|
||||
struct CClanMembers
|
||||
{
|
||||
|
||||
@@ -38,7 +38,9 @@ void StartSignal( )
|
||||
signal( SIGFPE, HandleSignal );
|
||||
signal( SIGSEGV, HandleSignal );
|
||||
signal( SIGTERM, HandleSignal );
|
||||
#ifdef _WIN32
|
||||
signal( SIGBREAK, HandleSignal );
|
||||
#endif
|
||||
signal( SIGABRT, HandleSignal );
|
||||
}
|
||||
|
||||
@@ -49,7 +51,9 @@ void StopSignal( )
|
||||
signal( SIGFPE, 0 );
|
||||
signal( SIGSEGV, 0 );
|
||||
signal( SIGTERM, 0 );
|
||||
#ifdef _WIN32
|
||||
signal( SIGBREAK, 0 );
|
||||
#endif
|
||||
signal( SIGABRT, 0 );
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user