diagnostics

log checksum

Update WorldServer.cpp

Update WorldServer.cpp

lotta this

Update WorldServer.cpp

Update WorldServer.cpp

Update WorldServer.cpp

Update Logger.cpp

logs

Update WorldServer.cpp

dCommon/Diagnostics.cpp

@@ -1,7 +1,7 @@
 #include "Diagnostics.h"
 #include "Game.h"
 #include "Logger.h"
-
+#define _XOPEN_SOURCE
 // If we're on Win32, we'll include our minidump writer
 #ifdef _WIN32
 
@@ -60,7 +60,7 @@ LONG CALLBACK unhandled_handler(EXCEPTION_POINTERS* e) {
 }
 #endif
 
-#if defined(__linux__) //&& !defined(__clang__) // backtrace is a gcc exclusive system library
+// #if defined(__linux__) //&& !defined(__clang__) // backtrace is a gcc exclusive system library
 #include <execinfo.h>
 #include <ucontext.h>
 #include <unistd.h>
@@ -219,16 +219,16 @@ void MakeBacktrace() {
 
 	std::set_terminate(OnTerminate);
 }
-#endif
+// #endif
 
 void Diagnostics::Initialize() {
-#ifdef _WIN32
-	SetUnhandledExceptionFilter(unhandled_handler);
-#elif defined(__linux__) //&& !defined(__clang__)
+// #ifdef _WIN32
+	// SetUnhandledExceptionFilter(unhandled_handler);
+// #elif defined(__linux__) //&& !defined(__clang__)
 	MakeBacktrace();
-#else
-	fprintf(stderr, "Diagnostics not supported on this platform.\n");
-#endif
+// #else
+	// fprintf(stderr, "Diagnostics not supported on this platform.\n");
+// #endif
 }
 
 std::string Diagnostics::m_ProcessName{};

dCommon/Logger.cpp

@@ -58,6 +58,7 @@ void Logger::vLog(const char* format, va_list args) {
 	for (const auto& writer : m_Writers) {
 		writer->Log(timeStr, message);
 	}
+	Flush();
 }
 
 void Logger::Log(const char* className, const char* format, ...) {

dWorldServer/WorldServer.cpp

@@ -267,8 +267,6 @@ int main(int argc, char** argv) {
 
 	// pre calculate the FDB checksum
 	if (Game::config->GetValue("check_fdb") == "1") {
-		std::ifstream fileStream;
-
 		static const std::vector<std::string> aliases = {
 			"CDServers.fdb",
 			"cdserver.fdb",
@@ -277,31 +275,29 @@ int main(int argc, char** argv) {
 		};
 
 		for (const auto& file : aliases) {
-			fileStream.open(Game::assetManager->GetResPath() / file, std::ios::binary | std::ios::in);
-			if (fileStream.is_open()) {
+			auto cdclient = Game::assetManager->GetFile("cdclient.fdb");
+			if (cdclient) {
+
+				const int32_t bufferSize = 1024;
+				MD5 md5;
+
+				char fileStreamBuffer[1024] = {};
+
+				while (!cdclient.eof()) {
+					memset(fileStreamBuffer, 0, bufferSize);
+					cdclient.read(fileStreamBuffer, bufferSize);
+					md5.update(fileStreamBuffer, cdclient.gcount());
+				}
+
+				const char* nullTerminateBuffer = "\0";
+				md5.update(nullTerminateBuffer, 1); // null terminate the data
+				md5.finalize();
+				databaseChecksum = md5.hexdigest();
+
+				LOG("FDB Checksum calculated as: %s", databaseChecksum.c_str());
 				break;
 			}
 		}
-
-		const int32_t bufferSize = 1024;
-		MD5 md5;
-
-		char fileStreamBuffer[1024] = {};
-
-		while (!fileStream.eof()) {
-			memset(fileStreamBuffer, 0, bufferSize);
-			fileStream.read(fileStreamBuffer, bufferSize);
-			md5.update(fileStreamBuffer, fileStream.gcount());
-		}
-
-		fileStream.close();
-
-		const char* nullTerminateBuffer = "\0";
-		md5.update(nullTerminateBuffer, 1); // null terminate the data
-		md5.finalize();
-		databaseChecksum = md5.hexdigest();
-
-		LOG("FDB Checksum calculated as: %s", databaseChecksum.c_str());
 	}
 
 	uint32_t currentFrameDelta = highFrameDelta;
@@ -548,115 +544,115 @@ void HandlePacketChat(Packet* packet) {
 	if (packet->data[0] == ID_USER_PACKET_ENUM && packet->length >= 4) {
 		if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::CHAT) {
 			switch (static_cast<MessageType::Chat>(packet->data[3])) {
-				case MessageType::Chat::WORLD_ROUTE_PACKET: {
-					CINSTREAM_SKIP_HEADER;
-					LWOOBJID playerID;
-					inStream.Read(playerID);
+			case MessageType::Chat::WORLD_ROUTE_PACKET: {
+				CINSTREAM_SKIP_HEADER;
+				LWOOBJID playerID;
+				inStream.Read(playerID);
 
-					auto player = Game::entityManager->GetEntity(playerID);
-					if (!player) return;
+				auto player = Game::entityManager->GetEntity(playerID);
+				if (!player) return;
 
-					auto sysAddr = player->GetSystemAddress();
+				auto sysAddr = player->GetSystemAddress();
 
-					//Write our stream outwards:
-					CBITSTREAM;
-					unsigned char data;
-					while (inStream.Read(data)) {
-						bitStream.Write(data);
-					}
-
-					SEND_PACKET; //send routed packet to player
-					break;
+				//Write our stream outwards:
+				CBITSTREAM;
+				unsigned char data;
+				while (inStream.Read(data)) {
+					bitStream.Write(data);
 				}
 
-				case MessageType::Chat::GM_ANNOUNCE: {
-					CINSTREAM_SKIP_HEADER;
+				SEND_PACKET; //send routed packet to player
+				break;
+			}
 
-					std::string title;
-					std::string msg;
+			case MessageType::Chat::GM_ANNOUNCE: {
+				CINSTREAM_SKIP_HEADER;
 
-					uint32_t len;
-					inStream.Read<uint32_t>(len);
-					for (uint32_t i = 0; len > i; i++) {
-						char character;
-						inStream.Read<char>(character);
-						title += character;
-					}
+				std::string title;
+				std::string msg;
 
-					len = 0;
-					inStream.Read<uint32_t>(len);
-					for (uint32_t i = 0; len > i; i++) {
-						char character;
-						inStream.Read<char>(character);
-						msg += character;
-					}
+				uint32_t len;
+				inStream.Read<uint32_t>(len);
+				for (uint32_t i = 0; len > i; i++) {
+					char character;
+					inStream.Read<char>(character);
+					title += character;
+				}
 
-					//Send to our clients:
-					AMFArrayValue args;
+				len = 0;
+				inStream.Read<uint32_t>(len);
+				for (uint32_t i = 0; len > i; i++) {
+					char character;
+					inStream.Read<char>(character);
+					msg += character;
+				}
 
-					args.Insert("title", title);
-					args.Insert("message", msg);
+				//Send to our clients:
+				AMFArrayValue args;
 
-					GameMessages::SendUIMessageServerToAllClients("ToggleAnnounce", args);
+				args.Insert("title", title);
+				args.Insert("message", msg);
+
+				GameMessages::SendUIMessageServerToAllClients("ToggleAnnounce", args);
+
+				break;
+			}
+
+			case MessageType::Chat::GM_MUTE: {
+				CINSTREAM_SKIP_HEADER;
+				LWOOBJID playerId;
+				time_t expire = 0;
+				inStream.Read(playerId);
+				inStream.Read(expire);
+
+				auto* entity = Game::entityManager->GetEntity(playerId);
+				auto* character = entity != nullptr ? entity->GetCharacter() : nullptr;
+				auto* user = character != nullptr ? character->GetParentUser() : nullptr;
+				if (user) {
+					user->SetMuteExpire(expire);
+
+					entity->GetCharacter()->SendMuteNotice();
+				}
+
+				break;
+			}
+
+			case MessageType::Chat::TEAM_GET_STATUS: {
+				CINSTREAM_SKIP_HEADER;
+
+				LWOOBJID teamID = 0;
+				char lootOption = 0;
+				char memberCount = 0;
+				std::vector<LWOOBJID> members;
+
+				inStream.Read(teamID);
+				bool deleteTeam = inStream.ReadBit();
+
+				if (deleteTeam) {
+					TeamManager::Instance()->DeleteTeam(teamID);
+
+					LOG("Deleting team (%llu)", teamID);
 
 					break;
 				}
 
-				case MessageType::Chat::GM_MUTE: {
-					CINSTREAM_SKIP_HEADER;
-					LWOOBJID playerId;
-					time_t expire = 0;
-					inStream.Read(playerId);
-					inStream.Read(expire);
+				inStream.Read(lootOption);
+				inStream.Read(memberCount);
+				LOG("Updating team (%llu), (%i), (%i)", teamID, lootOption, memberCount);
+				for (char i = 0; i < memberCount; i++) {
+					LWOOBJID member = LWOOBJID_EMPTY;
+					inStream.Read(member);
+					members.push_back(member);
 
-					auto* entity = Game::entityManager->GetEntity(playerId);
-					auto* character = entity != nullptr ? entity->GetCharacter() : nullptr;
-					auto* user = character != nullptr ? character->GetParentUser() : nullptr;
-					if (user) {
-						user->SetMuteExpire(expire);
-
-						entity->GetCharacter()->SendMuteNotice();
-					}
-
-					break;
+					LOG("Updating team member (%llu)", member);
 				}
 
-				case MessageType::Chat::TEAM_GET_STATUS: {
-					CINSTREAM_SKIP_HEADER;
+				TeamManager::Instance()->UpdateTeam(teamID, lootOption, members);
 
-					LWOOBJID teamID = 0;
-					char lootOption = 0;
-					char memberCount = 0;
-					std::vector<LWOOBJID> members;
-
-					inStream.Read(teamID);
-					bool deleteTeam = inStream.ReadBit();
-
-					if (deleteTeam) {
-						TeamManager::Instance()->DeleteTeam(teamID);
-
-						LOG("Deleting team (%llu)", teamID);
-
-						break;
-					}
-
-					inStream.Read(lootOption);
-					inStream.Read(memberCount);
-					LOG("Updating team (%llu), (%i), (%i)", teamID, lootOption, memberCount);
-					for (char i = 0; i < memberCount; i++) {
-						LWOOBJID member = LWOOBJID_EMPTY;
-						inStream.Read(member);
-						members.push_back(member);
-
-						LOG("Updating team member (%llu)", member);
-					}
-
-					TeamManager::Instance()->UpdateTeam(teamID, lootOption, members);
-
-					break;
-				}
-				default:
-					LOG("Received an unknown chat: %i", int(packet->data[3]));
+				break;
+			}
+			default:
+				LOG("Received an unknown chat: %i", int(packet->data[3]));
 			}
 		}
 	}
@@ -869,10 +865,12 @@ void HandlePacket(Packet* packet) {
 				Game::server->Disconnect(packet->systemAddress, eServerDisconnectIdentifiers::CHARACTER_NOT_FOUND);
 				return;
 			}
+			LOG("server %s client %s", databaseChecksum.c_str(), clientDatabaseChecksum.string.c_str());
 
 			// Developers may skip this check
 			if (clientDatabaseChecksum.string != databaseChecksum) {
 
+				LOG("");
 				if (accountInfo->maxGmLevel < eGameMasterLevel::DEVELOPER) {
 					LOG("Client's database checksum does not match the server's, aborting connection.");
 					std::vector<Stamp> stamps;
@@ -884,6 +882,7 @@ void HandlePacket(Packet* packet) {
 						Game::config->GetValue("cdclient_mismatch_message"), "", 0, "", stamps);
 					return;
 				} else {
+					LOG("");
 					AMFArrayValue args;
 
 					args.Insert("title", Game::config->GetValue("cdclient_mismatch_title"));
@@ -896,18 +895,21 @@ void HandlePacket(Packet* packet) {
 			}
 		}
 
+		LOG("");
 		//Request the session info from Master:
 		CBITSTREAM;
 		BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, MessageType::Master::REQUEST_SESSION_KEY);
 		bitStream.Write(username);
 		Game::server->SendToMaster(bitStream);
 
+		LOG("");
 		//Insert info into our pending list
 		tempSessionInfo info;
 		info.sysAddr = SystemAddress(packet->systemAddress);
 		info.hash = sessionKey.GetAsString();
 		m_PendingUsers.insert(std::make_pair(username.GetAsString(), info));
 
+		LOG("");
 		break;
 	}