Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 05:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Change Mail to use BitStream references (#1474)

Browse Source
This commit is contained in:
jadebenn 2024-02-26 22:01:18 -06:00 committed by GitHub
parent 7235423c7b
commit 30b9ef8ab2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dGame/dUtilities/Mail.cpp
View File

@ -95,39 +95,39 @@ void Mail::SendMail(const LWOOBJID sender, const std::string& senderName, LWOOBJ
} }
//Because we need it: //Because we need it:
std::string ReadWStringAsString(RakNet::BitStream* bitStream, uint32_t size) { std::string ReadWStringAsString(RakNet::BitStream& bitStream, uint32_t size) {
std::string toReturn = ""; std::string toReturn = "";
uint8_t buffer; uint8_t buffer;
bool isFinishedReading = false; bool isFinishedReading = false;
for (uint32_t i = 0; i < size; ++i) { for (uint32_t i = 0; i < size; ++i) {
bitStream->Read(buffer); bitStream.Read(buffer);
if (!isFinishedReading) toReturn.push_back(buffer); if (!isFinishedReading) toReturn.push_back(buffer);
if (buffer == '\0') isFinishedReading = true; //so we don't continue to read garbage as part of the string. if (buffer == '\0') isFinishedReading = true; //so we don't continue to read garbage as part of the string.
bitStream->Read(buffer); //Read the null term bitStream.Read(buffer); //Read the null term
} }
return toReturn; return toReturn;
} }
void WriteStringAsWString(RakNet::BitStream* bitStream, std::string str, uint32_t size) { void WriteStringAsWString(RakNet::BitStream& bitStream, std::string str, uint32_t size) {
uint32_t sizeToFill = size - str.size(); uint32_t sizeToFill = size - str.size();
for (uint32_t i = 0; i < str.size(); ++i) { for (uint32_t i = 0; i < str.size(); ++i) {
bitStream->Write(str[i]); bitStream.Write(str[i]);
bitStream->Write(uint8_t(0)); bitStream.Write(uint8_t(0));
} }
for (uint32_t i = 0; i < sizeToFill; ++i) { for (uint32_t i = 0; i < sizeToFill; ++i) {
bitStream->Write(uint16_t(0)); bitStream.Write(uint16_t(0));
} }
} }
void Mail::HandleMailStuff(RakNet::BitStream* packet, const SystemAddress& sysAddr, Entity* entity) { void Mail::HandleMailStuff(RakNet::BitStream& packet, const SystemAddress& sysAddr, Entity* entity) {
int mailStuffID = 0; int mailStuffID = 0;
packet->Read(mailStuffID); packet.Read(mailStuffID);
auto returnVal = std::async(std::launch::async, [packet, &sysAddr, entity, mailStuffID]() { auto returnVal = std::async(std::launch::async, [&packet, &sysAddr, entity, mailStuffID]() {
Mail::MailMessageID stuffID = MailMessageID(mailStuffID); Mail::MailMessageID stuffID = MailMessageID(mailStuffID);
switch (stuffID) { switch (stuffID) {
case MailMessageID::AttachmentCollect: case MailMessageID::AttachmentCollect:
@ -154,7 +154,7 @@ void Mail::HandleMailStuff(RakNet::BitStream* packet, const SystemAddress& sysAd
}); });
} }
void Mail::HandleSendMail(RakNet::BitStream* packet, const SystemAddress& sysAddr, Entity* entity) { void Mail::HandleSendMail(RakNet::BitStream& packet, const SystemAddress& sysAddr, Entity* entity) {
//std::string subject = GeneralUtils::WStringToString(ReadFromPacket(packet, 50)); //std::string subject = GeneralUtils::WStringToString(ReadFromPacket(packet, 50));
//std::string body = GeneralUtils::WStringToString(ReadFromPacket(packet, 400)); //std::string body = GeneralUtils::WStringToString(ReadFromPacket(packet, 400));
//std::string recipient = GeneralUtils::WStringToString(ReadFromPacket(packet, 32)); //std::string recipient = GeneralUtils::WStringToString(ReadFromPacket(packet, 32));
@ -186,9 +186,9 @@ void Mail::HandleSendMail(RakNet::BitStream* packet, const SystemAddress& sysAdd
LWOOBJID attachmentID; LWOOBJID attachmentID;
uint16_t attachmentCount; uint16_t attachmentCount;
packet->Read(unknown64); packet.Read(unknown64);
packet->Read(attachmentID); packet.Read(attachmentID);
packet->Read(attachmentCount); //We don't care about the rest of the packet. packet.Read(attachmentCount); //We don't care about the rest of the packet.
uint32_t itemID = static_cast<uint32_t>(attachmentID); uint32_t itemID = static_cast<uint32_t>(attachmentID);
LOT itemLOT = 0; LOT itemLOT = 0;
//Inventory::InventoryType itemType; //Inventory::InventoryType itemType;
@ -261,7 +261,7 @@ void Mail::HandleSendMail(RakNet::BitStream* packet, const SystemAddress& sysAdd
character->SaveXMLToDatabase(); character->SaveXMLToDatabase();
} }
void Mail::HandleDataRequest(RakNet::BitStream* packet, const SystemAddress& sysAddr, Entity* player) { void Mail::HandleDataRequest(RakNet::BitStream& packet, const SystemAddress& sysAddr, Entity* player) {
auto playerMail = Database::Get()->GetMailForPlayer(player->GetCharacter()->GetID(), 20); auto playerMail = Database::Get()->GetMailForPlayer(player->GetCharacter()->GetID(), 20);
RakNet::BitStream bitStream; RakNet::BitStream bitStream;
@ -275,9 +275,9 @@ void Mail::HandleDataRequest(RakNet::BitStream* packet, const SystemAddress& sys
for (const auto& mail : playerMail) { for (const auto& mail : playerMail) {
bitStream.Write(mail.id); //MailID bitStream.Write(mail.id); //MailID
WriteStringAsWString(&bitStream, mail.subject.c_str(), 50); //subject WriteStringAsWString(bitStream, mail.subject.c_str(), 50); //subject
WriteStringAsWString(&bitStream, mail.body.c_str(), 400); //body WriteStringAsWString(bitStream, mail.body.c_str(), 400); //body
WriteStringAsWString(&bitStream, mail.senderUsername.c_str(), 32); //sender WriteStringAsWString(bitStream, mail.senderUsername.c_str(), 32); //sender
bitStream.Write(uint32_t(0)); bitStream.Write(uint32_t(0));
bitStream.Write(uint64_t(0)); bitStream.Write(uint64_t(0));
@ -306,13 +306,13 @@ void Mail::HandleDataRequest(RakNet::BitStream* packet, const SystemAddress& sys
Game::server->Send(&bitStream, sysAddr, false); Game::server->Send(&bitStream, sysAddr, false);
} }
void Mail::HandleAttachmentCollect(RakNet::BitStream* packet, const SystemAddress& sysAddr, Entity* player) { void Mail::HandleAttachmentCollect(RakNet::BitStream& packet, const SystemAddress& sysAddr, Entity* player) {
int unknown; int unknown;
uint64_t mailID; uint64_t mailID;
LWOOBJID playerID; LWOOBJID playerID;
packet->Read(unknown); packet.Read(unknown);
packet->Read(mailID); packet.Read(mailID);
packet->Read(playerID); packet.Read(playerID);
if (mailID > 0 && playerID == player->GetObjectID()) { if (mailID > 0 && playerID == player->GetObjectID()) {
auto playerMail = Database::Get()->GetMail(mailID); auto playerMail = Database::Get()->GetMail(mailID);
@ -336,22 +336,22 @@ void Mail::HandleAttachmentCollect(RakNet::BitStream* packet, const SystemAddres
} }
} }
void Mail::HandleMailDelete(RakNet::BitStream* packet, const SystemAddress& sysAddr) { void Mail::HandleMailDelete(RakNet::BitStream& packet, const SystemAddress& sysAddr) {
int unknown; int unknown;
uint64_t mailID; uint64_t mailID;
LWOOBJID playerID; LWOOBJID playerID;
packet->Read(unknown); packet.Read(unknown);
packet->Read(mailID); packet.Read(mailID);
packet->Read(playerID); packet.Read(playerID);
if (mailID > 0) Mail::SendDeleteConfirm(sysAddr, mailID, playerID); if (mailID > 0) Mail::SendDeleteConfirm(sysAddr, mailID, playerID);
} }
void Mail::HandleMailRead(RakNet::BitStream* packet, const SystemAddress& sysAddr) { void Mail::HandleMailRead(RakNet::BitStream& packet, const SystemAddress& sysAddr) {
int unknown; int unknown;
uint64_t mailID; uint64_t mailID;
packet->Read(unknown); packet.Read(unknown);
packet->Read(mailID); packet.Read(mailID);
if (mailID > 0) Mail::SendReadConfirm(sysAddr, mailID); if (mailID > 0) Mail::SendReadConfirm(sysAddr, mailID);
} }

12
dGame/dUtilities/Mail.h
View File

@ -79,12 +79,12 @@ namespace Mail {
const SystemAddress& sysAddr const SystemAddress& sysAddr
); );
void HandleMailStuff(RakNet::BitStream* packet, const SystemAddress& sysAddr, Entity* entity); void HandleMailStuff(RakNet::BitStream& packet, const SystemAddress& sysAddr, Entity* entity);
void HandleSendMail(RakNet::BitStream* packet, const SystemAddress& sysAddr, Entity* entity); void HandleSendMail(RakNet::BitStream& packet, const SystemAddress& sysAddr, Entity* entity);
void HandleDataRequest(RakNet::BitStream* packet, const SystemAddress& sysAddr, Entity* player); void HandleDataRequest(RakNet::BitStream& packet, const SystemAddress& sysAddr, Entity* player);
void HandleAttachmentCollect(RakNet::BitStream* packet, const SystemAddress& sysAddr, Entity* player); void HandleAttachmentCollect(RakNet::BitStream& packet, const SystemAddress& sysAddr, Entity* player);
void HandleMailDelete(RakNet::BitStream* packet, const SystemAddress& sysAddr); void HandleMailDelete(RakNet::BitStream& packet, const SystemAddress& sysAddr);
void HandleMailRead(RakNet::BitStream* packet, const SystemAddress& sysAddr); void HandleMailRead(RakNet::BitStream& packet, const SystemAddress& sysAddr);
void HandleNotificationRequest(const SystemAddress& sysAddr, uint32_t objectID); void HandleNotificationRequest(const SystemAddress& sysAddr, uint32_t objectID);
void SendSendResponse(const SystemAddress& sysAddr, MailSendResponse response); void SendSendResponse(const SystemAddress& sysAddr, MailSendResponse response);

2
dWorldServer/WorldServer.cpp
View File

@ -1177,7 +1177,7 @@ void HandlePacket(Packet* packet) {
// FIXME: Change this to the macro to skip the header... // FIXME: Change this to the macro to skip the header...
LWOOBJID space; LWOOBJID space;
bitStream.Read(space); bitStream.Read(space);
Mail::HandleMailStuff(&bitStream, packet->systemAddress, UserManager::Instance()->GetUser(packet->systemAddress)->GetLastUsedChar()->GetEntity()); Mail::HandleMailStuff(bitStream, packet->systemAddress, UserManager::Instance()->GetUser(packet->systemAddress)->GetLastUsedChar()->GetEntity());
break; break;
} }