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
@@ -13,7 +13,11 @@ public:
|
||||
unsigned dataoffset = 0;
|
||||
unsigned short fieldlen = 0;
|
||||
|
||||
if ( (fh = fopen( filename, "rb" )) != 0 ) {
|
||||
#ifdef _WIN32
|
||||
if ( (fh = fopen( filename, "rb" )) == 0 ) {
|
||||
#else
|
||||
if ( (fh = rose_fopen( filename, "rb" )) == 0 ) {
|
||||
#endif
|
||||
Log( MSG_ERROR, "Could not load STB '%s'", filename );
|
||||
return 1;
|
||||
}else{
|
||||
|
||||
@@ -219,7 +219,11 @@ class CRoseFile
|
||||
if( fopen_s( &fh, fname, fasciimode ) == 0 )
|
||||
{
|
||||
#else
|
||||
if( ( fh = fopen( fname, fasciimode ) ) != NULL )
|
||||
#ifdef _WIN32
|
||||
if( ( fh = fopen( fname, fasciimode ) ) != NULL )
|
||||
#else
|
||||
if( ( fh = rose_fopen( fname, fasciimode ) ) != NULL )
|
||||
#endif
|
||||
{
|
||||
#endif
|
||||
delete[] fasciimode;
|
||||
@@ -242,8 +246,10 @@ class CRoseFile
|
||||
}
|
||||
#ifndef CFILE_NODEPRECATE
|
||||
fopen_s( &fh, fname, fasciimode );
|
||||
#else
|
||||
#elif defined(_WIN32)
|
||||
fh = fopen( fname, fasciimode );
|
||||
#else
|
||||
fh = rose_fopen( fname, fasciimode );
|
||||
#endif
|
||||
SetAbsPos( 2 );
|
||||
ftype = FT_UNICODE;
|
||||
|
||||
@@ -184,8 +184,8 @@ QUESTREWD(002)
|
||||
|
||||
for(dword i = 0; i < data->iDataCnt; i++)
|
||||
{
|
||||
dword address = i * sizeof(STR_QUEST_DATA);
|
||||
address += (dword)data;
|
||||
uintptr_t address = i * sizeof(STR_QUEST_DATA);
|
||||
address += (uintptr_t)data;
|
||||
address += 4;
|
||||
STR_QUEST_DATA* curQst = (STR_QUEST_DATA*)address;
|
||||
if( client->questdebug )
|
||||
@@ -208,8 +208,8 @@ QUESTREWD(003)
|
||||
//byte btOp; pos 0x0c
|
||||
for(dword i = 0; i < data->iDataCnt; i++)
|
||||
{
|
||||
//dword address = i * 0x0C;
|
||||
//address += (dword)data;
|
||||
//uintptr_t address = i * 0x0C;
|
||||
//address += (uintptr_t)data;
|
||||
//address += 4;
|
||||
//STR_ABIL_DATA* curAbil = (STR_ABIL_DATA*)address;
|
||||
if( client->questdebug )
|
||||
|
||||
@@ -37,8 +37,8 @@ QUESTCOND(001)
|
||||
if( client->questdebug )server->SendPM(client, "Data Count for this quest %i",data->iDataCnt);
|
||||
for(int i = 0; i < data->iDataCnt; i++)
|
||||
{
|
||||
dword address = i * sizeof(STR_QUEST_DATA);
|
||||
address += (dword)data;
|
||||
uintptr_t address = i * sizeof(STR_QUEST_DATA);
|
||||
address += (uintptr_t)data;
|
||||
address += 4;
|
||||
STR_QUEST_DATA* curQst = (STR_QUEST_DATA*)address;
|
||||
word nValue = curQst->nValue;
|
||||
@@ -96,8 +96,8 @@ QUESTCOND(003)
|
||||
GETCONDDATA(003);
|
||||
for(int i = 0; i < data->iDataCnt; i++)
|
||||
{
|
||||
dword address = i * 0x0C;
|
||||
address += (dword)data;
|
||||
uintptr_t address = i * 0x0C;
|
||||
address += (uintptr_t)data;
|
||||
address += 4;
|
||||
STR_ABIL_DATA* curAbil = (STR_ABIL_DATA*)address;
|
||||
if( client->questdebug )
|
||||
@@ -175,8 +175,8 @@ QUESTCOND(004)
|
||||
GETCONDDATA(004);
|
||||
for(int i = 0; i < data->iDataCnt; i++)
|
||||
{
|
||||
dword address = i * 0x10;
|
||||
address += (dword)data;
|
||||
uintptr_t address = i * 0x10;
|
||||
address += (uintptr_t)data;
|
||||
address += 4;
|
||||
STR_ITEM_DATA* curItem = (STR_ITEM_DATA*)address;
|
||||
if( client->questdebug )
|
||||
|
||||
@@ -78,7 +78,7 @@ void CWorldServer::ReadQSD(strings path, dword index){
|
||||
}
|
||||
|
||||
void CWorldServer::LoadQuestData(){
|
||||
CStrStb* stbQuest = new CStrStb("3DDATA\\STB\\LIST_QUESTDATA.STB");
|
||||
CStrStb* stbQuest = new CStrStb("3DData/STB/LIST_QUESTDATA.STB");
|
||||
Log(MSG_INFO, "Loading QSD files");
|
||||
for(dword i = 1; i < stbQuest->Rows(); i++){
|
||||
if(stbQuest->Data(i, 0)){
|
||||
|
||||
Reference in new issue
Block a user