mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-10-02 19:03:43 +00:00
efa08ac1d0
The login's Stamps now go with auth's REQUEST_ZONE_TRANSFER to master and come back in REQUEST_ZONE_TRANSFER_RESPONSE, so master stamps the steps it performs itself, with its own time: got the request (WORLD_PACKET_RECEIVED, zone), the world is still starting and the request waits (IM_LOGIN_QUEUED, instance), answered with a world (WORLD_SESSION_CONFIRM_TO_AUTH, instance). Auth sends what comes back in the login response. Server to server wire change (message IDs unchanged): both messages end with a Stamps list (u32 16 * count + 4, then the stamps); it is empty (4 bytes) when a world server asks for a transfer. Touched: - MasterPackets::SendZoneTransferRequest / SendZoneTransferResponse: take and write the stamps (default empty) - MasterServer.cpp REQUEST_ZONE_TRANSFER: reads them, stamps, keeps them in the PendingInstanceRequest (new stamps member, InstanceManager.h) - InstanceManager::ReadyInstance / AffirmTransfer: stamp and send them back - ZoneInstanceManager: HandleRequestZoneTransferResponse reads them; a RequestZoneTransfer overload takes stamps and a callback that gets them - AuthPackets LoginRequest::Handle uses that overload Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
68 lines
2.4 KiB
C++
68 lines
2.4 KiB
C++
#include "ZoneInstanceManager.h"
|
|
|
|
// Custom Classes
|
|
#include "MasterPackets.h"
|
|
|
|
// Static Variables
|
|
ZoneInstanceManager* ZoneInstanceManager::m_Address = nullptr;
|
|
|
|
//! Requests a zone transfer
|
|
void ZoneInstanceManager::RequestZoneTransfer(dServer* server, uint32_t zoneID, uint32_t zoneClone, bool mythranShift, TransferCallback callback) {
|
|
RequestZoneTransfer(server, zoneID, zoneClone, mythranShift, Stamps{}, [callback](bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, std::string serverIP, uint16_t serverPort, Stamps) {
|
|
callback(mythranShift, zoneID, zoneInstance, zoneClone, serverIP, serverPort);
|
|
});
|
|
}
|
|
|
|
void ZoneInstanceManager::RequestZoneTransfer(dServer* server, uint32_t zoneID, uint32_t zoneClone, bool mythranShift, const Stamps& stamps, StampedTransferCallback callback) {
|
|
const auto nextID = ++currentRequestID;
|
|
requests[nextID] = callback;
|
|
|
|
MasterPackets::SendZoneTransferRequest(server, nextID, mythranShift, zoneID, zoneClone, stamps);
|
|
}
|
|
|
|
//! Handles a zone transfer response
|
|
void ZoneInstanceManager::HandleRequestZoneTransferResponse(Packet* packet) {
|
|
CINSTREAM_SKIP_HEADER;
|
|
uint64_t requestID;
|
|
inStream.Read(requestID);
|
|
bool mythranShift;
|
|
uint8_t tmp;
|
|
inStream.Read(tmp);
|
|
mythranShift = tmp > 0;
|
|
uint32_t zoneID;
|
|
inStream.Read(zoneID);
|
|
uint32_t zoneInstance;
|
|
inStream.Read(zoneInstance);
|
|
uint32_t zoneClone;
|
|
inStream.Read(zoneClone);
|
|
uint16_t serverPort;
|
|
inStream.Read(serverPort);
|
|
LUString serverIP(255);
|
|
inStream.Read(serverIP);
|
|
Stamps stamps;
|
|
if (!stamps.Deserialize(inStream)) stamps = {};
|
|
|
|
const auto entry = requests.find(requestID);
|
|
if (entry != requests.end()) {
|
|
entry->second(mythranShift, zoneID, zoneInstance, zoneClone, serverIP.string, serverPort, stamps);
|
|
requests.erase(entry);
|
|
}
|
|
}
|
|
|
|
void ZoneInstanceManager::CreatePrivateZone(dServer* server, uint32_t zoneID, uint32_t zoneClone, const std::string& password) {
|
|
MasterPackets::SendZoneCreatePrivate(server, zoneID, zoneClone, password);
|
|
}
|
|
|
|
void ZoneInstanceManager::RequestPrivateZone(
|
|
dServer* server,
|
|
bool mythranShift,
|
|
const std::string& password,
|
|
TransferCallback callback) {
|
|
const auto nextID = ++currentRequestID;
|
|
requests[nextID] = [callback](bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, std::string serverIP, uint16_t serverPort, Stamps) {
|
|
callback(mythranShift, zoneID, zoneInstance, zoneClone, serverIP, serverPort);
|
|
};
|
|
|
|
MasterPackets::SendZoneRequestPrivate(server, nextID, mythranShift, password);
|
|
}
|