mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-10-12 15:53:44 +00:00
refactor: world packets as structs
WorldPackets now holds what a client sends a world server, one struct per packet with Serialize/Deserialize: Validation, CharacterListRequest, CharacterCreateRequest, CharacterLoginRequest, GameMessage, CharacterDeleteRequest, CharacterRenameRequest, LevelLoadComplete, PositionUpdate, MailPacket, RoutePacket, StringCheck, GeneralChatMessage, HandleFunness, UIHelpTop5. WorldServer's switch became a dispatch map of handlers (each overrides Handle in WorldServer.cpp, logic unchanged: dashboard hooks, LoadPlayer, chat logging, migration checks, message inspector capture all still run); a packet that does not deserialize is logged and dropped. UserManager's create/delete/rename take the structs. The answers are ClientPackets (the CLIENT service): LoadStaticZone, CharacterListResponse, CharacterCreateResponse, CharacterRenameResponse, DeleteCharacterResponse, TransferToWorld, ServerStates, CreateCharacter, ChatModerationString, MakeGMResponse, HTTPMonitorInfoResponse and DebugOutput, built at the call sites (world server, UserManager, slash commands, dashboard actions, components, migration). The world -> chat forward of a routed packet is ChatPackets::RoutedFromClient. All WorldPackets::Send* functions, HTTPMonitorInfo and the ClientPackets parse functions are gone. The architecture doc now states the file rule: a packet lives in the file of the ServiceType in its header. No wire change. Verified against frozen verbatim copies of the old code (tests/dGameTests/dNetTests/Legacy/WorldPacketsLegacy.h): every response is sent through the old function and the struct over grids of inputs (all enum values, strings of every length class, IDs, >64 moderation segments, big XML) and must match byte for byte; every request is read by the old code and the struct and must give the same values; plus golden bytes, round trips, truncation checks and a field width mutation that made the tests fail. Only differences: malformed requests are dropped instead of handled with partial values, and LevelLoadComplete now reads the zone ID the client sends after it (lu_packets and captures show the 1.10.64 client always sends it; DLU ignored it). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
@@ -8,19 +8,23 @@
|
||||
|
||||
#include <cstdint>
|
||||
#include <ctime>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "BitStreamUtils.h"
|
||||
#include "MessageType/Client.h"
|
||||
#include "Stamps.h"
|
||||
#include "dCommonVars.h"
|
||||
#include "NiPoint3.h"
|
||||
|
||||
enum class eCharacterCreationResponse : uint8_t;
|
||||
enum class eGameMasterLevel : uint8_t;
|
||||
enum class eRenameResponse : uint8_t;
|
||||
|
||||
enum class eLoginResponse : uint8_t;
|
||||
|
||||
class PositionUpdate;
|
||||
|
||||
struct Packet;
|
||||
|
||||
enum class Language : uint32_t {
|
||||
en_US,
|
||||
pl_US,
|
||||
@@ -28,19 +32,6 @@ enum class Language : uint32_t {
|
||||
en_GB,
|
||||
};
|
||||
|
||||
struct ChatMessage {
|
||||
uint8_t chatChannel = 0;
|
||||
uint16_t unknown = 0;
|
||||
std::u16string message;
|
||||
};
|
||||
|
||||
struct ChatModerationRequest {
|
||||
uint8_t chatLevel = 0;
|
||||
uint8_t requestID = 0;
|
||||
std::string receiver;
|
||||
std::string message;
|
||||
};
|
||||
|
||||
namespace ClientPackets {
|
||||
// Server -> client. The auth server's answer to a login (the client's clientLoginResponsePacket).
|
||||
struct LoginResponse : public LUBitStream {
|
||||
@@ -73,10 +64,173 @@ namespace ClientPackets {
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
ChatMessage HandleChatMessage(Packet* packet);
|
||||
PositionUpdate HandleClientPositionUpdate(Packet* packet);
|
||||
ChatModerationRequest HandleChatModerationRequest(Packet* packet);
|
||||
int32_t SendTop5HelpIssues(Packet* packet);
|
||||
// Server -> client. Tells the client which zone to load (ClientLoadStaticZonePacket in the client).
|
||||
struct LoadStaticZone : public LUBitStream {
|
||||
uint16_t mapID{};
|
||||
uint16_t instanceID{};
|
||||
uint32_t cloneID{}; // DLU has always sent 0 here
|
||||
uint32_t mapChecksum{};
|
||||
uint8_t editorEnabled{};
|
||||
uint8_t editorLevel{};
|
||||
NiPoint3 playerPosition{};
|
||||
uint32_t instanceType{}; // Change this to eventually use 4 on activity worlds
|
||||
|
||||
LoadStaticZone() : LUBitStream(ServiceType::CLIENT, MessageType::Client::LOAD_STATIC_ZONE) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client. The account's characters for the character select screen.
|
||||
struct CharacterListResponse : public LUBitStream {
|
||||
struct Character {
|
||||
LWOOBJID objectID{};
|
||||
uint32_t unknown1{};
|
||||
LUWString name{ 33 };
|
||||
LUWString unapprovedName{ 33 };
|
||||
bool nameRejected{}; // Written as one byte
|
||||
bool isFreeToPlay{}; // Written as one byte
|
||||
LUString unknown2{ 10 };
|
||||
uint32_t shirtColor{};
|
||||
uint32_t shirtStyle{};
|
||||
uint32_t pantsColor{};
|
||||
uint32_t hairStyle{};
|
||||
uint32_t hairColor{};
|
||||
uint32_t leftHand{};
|
||||
uint32_t rightHand{};
|
||||
uint32_t eyebrows{};
|
||||
uint32_t eyes{};
|
||||
uint32_t mouth{};
|
||||
uint32_t unknown3{};
|
||||
uint16_t zoneID{};
|
||||
uint16_t zoneInstance{};
|
||||
uint32_t zoneClone{};
|
||||
uint64_t lastLogin{};
|
||||
std::vector<LOT> equippedItems{}; // After a u16 count
|
||||
};
|
||||
|
||||
// Written as a u8 count first
|
||||
uint8_t selectedCharacterIndex{}; // TODO: Pick the most recent played index. DLU always sends 0
|
||||
std::vector<Character> characters{};
|
||||
|
||||
CharacterListResponse() : LUBitStream(ServiceType::CLIENT, MessageType::Client::CHARACTER_LIST_RESPONSE) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client.
|
||||
struct CharacterCreateResponse : public LUBitStream {
|
||||
eCharacterCreationResponse response{};
|
||||
|
||||
CharacterCreateResponse() : LUBitStream(ServiceType::CLIENT, MessageType::Client::CHARACTER_CREATE_RESPONSE) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client.
|
||||
struct CharacterRenameResponse : public LUBitStream {
|
||||
eRenameResponse response{};
|
||||
|
||||
CharacterRenameResponse() : LUBitStream(ServiceType::CLIENT, MessageType::Client::CHARACTER_RENAME_RESPONSE) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client.
|
||||
struct DeleteCharacterResponse : public LUBitStream {
|
||||
bool success{}; // Written as one byte
|
||||
|
||||
DeleteCharacterResponse() : LUBitStream(ServiceType::CLIENT, MessageType::Client::DELETE_CHARACTER_RESPONSE) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client. Sends the client to another world server.
|
||||
struct TransferToWorld : public LUBitStream {
|
||||
LUString serverIP{ 33 };
|
||||
uint16_t serverPort{};
|
||||
bool mythranShift{}; // Written as one byte
|
||||
|
||||
TransferToWorld() : LUBitStream(ServiceType::CLIENT, MessageType::Client::TRANSFER_TO_WORLD) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client.
|
||||
struct ServerStates : public LUBitStream {
|
||||
uint8_t serverState = 1; // If the server is receiving this request, it probably is ready anyway.
|
||||
|
||||
ServerStates() : LUBitStream(ServiceType::CLIENT, MessageType::Client::SERVER_STATES) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client. The player's own character: a compressed LDF list.
|
||||
// On the wire: u32 compressed size + 9, u8 1 (compressed), u32 uncompressed size, u32 compressed size, the zlib data.
|
||||
struct CreateCharacter : public LUBitStream {
|
||||
LWOOBJID objectID{};
|
||||
LOT templateID = 1;
|
||||
std::string xmlData{};
|
||||
std::u16string name{};
|
||||
eGameMasterLevel gmLevel{};
|
||||
int32_t chatMode{}; // DLU sends the GM level
|
||||
int64_t reputation{};
|
||||
int32_t propertyCloneID{};
|
||||
|
||||
CreateCharacter() : LUBitStream(ServiceType::CLIENT, MessageType::Client::CREATE_CHARACTER) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client. The answer to WorldPackets::StringCheck.
|
||||
struct ChatModerationString : public LUBitStream {
|
||||
bool requestAccepted{}; // Written as one byte
|
||||
uint16_t sourceID = 0x16; // Unknown
|
||||
uint8_t requestID{};
|
||||
uint8_t chatMode{};
|
||||
LUWString receiver{ 42 };
|
||||
// (start, length) of each part that was not accepted, in 64 two byte slots; unused slots are 0
|
||||
std::set<std::pair<uint8_t, uint8_t>> rejectedSegments{};
|
||||
|
||||
ChatModerationString() : LUBitStream(ServiceType::CLIENT, MessageType::Client::CHAT_MODERATION_STRING) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client.
|
||||
struct MakeGMResponse : public LUBitStream {
|
||||
bool success{}; // Written as one byte
|
||||
eGameMasterLevel highestLevel{}; // Written as u16
|
||||
eGameMasterLevel previousLevel{}; // Written as u16
|
||||
eGameMasterLevel newLevel{}; // Written as u16
|
||||
|
||||
MakeGMResponse() : LUBitStream(ServiceType::CLIENT, MessageType::Client::MAKE_GM_RESPONSE) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client. DLU does not send it.
|
||||
struct HTTPMonitorInfoResponse : public LUBitStream {
|
||||
uint16_t port = 80;
|
||||
// Each written as one byte
|
||||
bool openWeb = false;
|
||||
bool supportsSum = false;
|
||||
bool supportsDetail = false;
|
||||
bool supportsWho = false;
|
||||
bool supportsObjects = false;
|
||||
|
||||
HTTPMonitorInfoResponse() : LUBitStream(ServiceType::CLIENT, MessageType::Client::HTTP_MONITOR_INFO_RESPONSE) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
|
||||
// Server -> client. Text for the client's debug output. DLU does not send it.
|
||||
struct DebugOutput : public LUBitStream {
|
||||
std::string data{}; // After a u32 length
|
||||
|
||||
DebugOutput() : LUBitStream(ServiceType::CLIENT, MessageType::Client::DEBUG_OUTPUT) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
};
|
||||
};
|
||||
|
||||
#endif // CLIENTPACKETS_H
|
||||
|
||||
Reference in New Issue
Block a user