mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-10-10 06:43:43 +00:00
fix(capture): replay keeps its records, skips RakNet's own messages and waits for transfers
- the expected answers pointed into a copy of the records that was gone by the diff - the client's recorded connect and disconnect messages are RakNet's, not sent again - a recorded move to another world is waited for as long as a zone takes to start - the handshake sends the client net version; reports are written after every bundle - a crash or Ctrl-C of the tool stops the sandbox stack too Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -28,6 +28,15 @@ namespace fs = std::filesystem;
|
||||
using json = nlohmann::json;
|
||||
|
||||
namespace {
|
||||
// The running stack's process group: stopped too if the tool is interrupted or crashes
|
||||
volatile sig_atomic_t g_Running = 0;
|
||||
|
||||
void StopOnSignal(int signal) {
|
||||
if (g_Running > 0) kill(-g_Running, SIGKILL);
|
||||
std::signal(signal, SIG_DFL);
|
||||
std::raise(signal);
|
||||
}
|
||||
|
||||
/**
|
||||
* Settings every sandbox gets over the server's own files. The first value of a key counts, so each key's line
|
||||
* is replaced where it is, and the ones the file doesn't have are added.
|
||||
@@ -181,7 +190,9 @@ namespace Sandbox {
|
||||
}
|
||||
|
||||
bool Stack::Start(std::string& error) {
|
||||
for (const int signal : { SIGINT, SIGTERM, SIGSEGV, SIGABRT }) std::signal(signal, StopOnSignal);
|
||||
m_Master = Launch(m_Dir, m_Dir / "MasterServer", m_Dir / "logs" / "master.out");
|
||||
g_Running = m_Master;
|
||||
// Auth answering is the sign the stack is up (master starts it after chat and the character select world)
|
||||
const auto until = std::chrono::steady_clock::now() + std::chrono::seconds(120);
|
||||
while (std::chrono::steady_clock::now() < until) {
|
||||
@@ -213,6 +224,7 @@ namespace Sandbox {
|
||||
kill(-m_Master, SIGKILL);
|
||||
waitpid(m_Master, &status, 0);
|
||||
m_Master = 0;
|
||||
g_Running = 0;
|
||||
}
|
||||
|
||||
int SetupCommand(const fs::path& bundlePath, const std::string& username, const std::string& password, bool characters, const fs::path& out) {
|
||||
|
||||
Reference in New Issue
Block a user