@@ -283,8 +283,6 @@ libmangosgame_a_SOURCES = \ Weather.h \ World.cpp \ World.h \ - WorldLog.cpp \ - WorldLog.h \ WorldSession.cpp \ WorldSession.h \ WorldSocket.cpp \ src/game/Makefile.am @@ -42,7 +42,6 @@ #include "WorldSession.h" #include "WorldSocketMgr.h" #include "Log.h" -#include "WorldLog.h" #if defined( __GNUC__ ) #pragma pack(1) @@ -166,24 +165,21 @@ int WorldSocket::SendPacket (const WorldPacket& pct) return -1; // Dump outgoing packet. - if (sWorldLog.LogWorld ()) + if (sLog.IsLogWorld()) { - sWorldLog.Log ("SERVER:\nSOCKET: %u\nLENGTH: %u\nOPCODE: %s (0x%.4X)\nDATA:\n", - (uint32) get_handle (), - pct.size (), - LookupOpcodeName (pct.GetOpcode ()), - pct.GetOpcode ()); - - uint32 p = 0; - while (p < pct.size ()) + sLog.outWorld("S->C - SOCKET: %u LENGTH: %u OPCODE: %s (0x%.4X)\n", + uint32(get_handle()), pct.size (), LookupOpcodeName(pct.GetOpcode()), pct.GetOpcode()); + + size_t p = 0; + while (p < pct.size()) { - for (uint32 j = 0; j < 16 && p < pct.size (); j++) - sWorldLog.Log ("%.2X ", const_cast<WorldPacket&>(pct)[p++]); + for (size_t j = 0; j < 16 && p < pct.size(); ++j) + sLog.outWorld("%.2X ", const_cast<WorldPacket&>(pct)[p++]); - sWorldLog.Log ("\n"); + sLog.outWorld("\n"); } - sWorldLog.Log ("\n\n"); + sLog.outWorld("\n\n"); } ServerPktHeader header(pct.size()+2, pct.GetOpcode()); @@ -682,25 +678,25 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) return -1; // Dump received packet. - if (sWorldLog.LogWorld ()) + if (sLog.IsLogWorld()) { - sWorldLog.Log ("CLIENT:\nSOCKET: %u\nLENGTH: %u\nOPCODE: %s (0x%.4X)\nDATA:\n", - (uint32) get_handle (), - new_pct->size (), - LookupOpcodeName (new_pct->GetOpcode ()), - new_pct->GetOpcode ()); - - uint32 p = 0; - while (p < new_pct->size ()) + sLog.outWorld("C->S - SOCKET: %u LENGTH: %u OPCODE: %s (0x%.4X)\n", + uint32(get_handle()), new_pct->size(), LookupOpcodeName(new_pct->GetOpcode()), new_pct->GetOpcode()); + + size_t p = 0; + while (p < new_pct->size()) { - for (uint32 j = 0; j < 16 && p < new_pct->size (); j++) - sWorldLog.Log ("%.2X ", (*new_pct)[p++]); - sWorldLog.Log ("\n"); + for (size_t j = 0; j < 16 && p < new_pct->size(); ++j) + sLog.outWorld("%.2X ", (*new_pct)[p++]); + + sLog.outWorld("\n"); } - sWorldLog.Log ("\n\n"); + + sLog.outWorld("\n\n"); } - try { + try + { switch(opcode) { case CMSG_PING: @@ -738,13 +734,13 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) } } } - catch(ByteBufferException &) + catch (ByteBufferException &) { sLog.outError("WorldSocket::ProcessIncoming ByteBufferException occured while parsing an instant handled packet (opcode: %u) from client %s, accountid=%i. Disconnected client.", opcode, GetRemoteAddress().c_str(), m_Session?m_Session->GetAccountId():-1); if(sLog.IsOutDebug()) { - sLog.outDebug("Dumping error causing packet:"); + sLog.outDebug("Dumping error-causing packet:"); new_pct->hexlike(); } src/game/WorldSocket.cpp @@ -22,7 +22,6 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "ByteBuffer.h" #include "Config/ConfigEnv.h" #include "Log.h" #include "RealmList.h" @@ -252,14 +251,37 @@ void AuthSocket::OnRead() ///- Read the packet TcpSocket::OnRead(); uint8 _cmd; - while (1) + while (true) { if (!ibuf.GetLength()) return; - ///- Get the command out of it + ///- Get the command out of it. We can assume it's there, since length is not 0. ibuf.SoftRead((char *)&_cmd, 1); // UQ1: No longer exists in new net code ??? + // Dump incoming packet. + if (sLog.IsLogWorld()) + { + sLog.outWorld ("C->S - SOCKET: %u LENGTH: %u OPCODE: 0x%.4X\n", + GetSocket(), ibuf.GetLength(), _cmd); + + size_t p = 0; + while (p < ibuf.GetLength()) + { + char dest; + for (size_t j = 0; j < 16 && p < ibuf.GetLength(); ++j) + { + ibuf.SoftRead(&dest, 1); + sLog.outWorld("%.2X ", *((uint8*)dest)); + p++; + } + + sLog.outWorld("\n"); + } + + sLog.outWorld("\n\n"); + } + size_t i; ///- Circle through known commands and call the correct command handler @@ -289,7 +311,34 @@ void AuthSocket::OnRead() } } -/// Make the SRP6 calculation from hash in dB +void AuthSocket::SendPacket(ByteBuffer* buf) +{ + // TODO: Also handle outgoing structs? + + uint8 _cmd = buf->read<uint8>(); + + // Dump outgoing packet. + if (sLog.IsLogWorld()) + { + sLog.outWorld ("S->C - SOCKET: %u LENGTH: %u OPCODE: 0x%.4X\n", + GetSocket(), buf->size(), _cmd); + + size_t p = 0; + while (p < buf->size()) + { + for (size_t j = 0; j < 16 && p < buf->size(); ++j) + sLog.outWorld("%.2X ", (*buf)[p++]); + + sLog.outWorld("\n"); + } + + sLog.outWorld("\n\n"); + } + + SendBuf((char const*)buf->contents(), buf->size()); +} + +/// Make the SRP6 calculation from hash in DB void AuthSocket::_SetVSFields(const std::string& rI) { s.SetRand(s_BYTE_SIZE * 8); @@ -521,7 +570,8 @@ bool AuthSocket::_HandleLogonChallenge() pkt<< (uint8) REALM_AUTH_NO_MATCH; } } - SendBuf((char const*)pkt.contents(), pkt.size()); + + SendPacket(&pkt); return true; } @@ -567,7 +617,7 @@ bool AuthSocket::_HandleLogonProof() pkt << (uint8) REALM_AUTH_WRONG_BUILD_NUMBER; DEBUG_LOG("[AuthChallenge] %u is not a valid client version!", _build); DEBUG_LOG("[AuthChallenge] Patch %s not found", tmp); - SendBuf((char const*)pkt.contents(), pkt.size()); + SendPacket(&pkt); return true; } else // have patch @@ -807,7 +857,7 @@ bool AuthSocket::_HandleReconnectChallenge() _reconnectProof.SetRand(16 * 8); pkt.append(_reconnectProof.AsByteArray(16),16); // 16 bytes random pkt << (uint64) 0x00 << (uint64) 0x00; // 16 bytes zeros - SendBuf((char const*)pkt.contents(), pkt.size()); + SendPacket(&pkt); return true; } @@ -839,7 +889,7 @@ bool AuthSocket::_HandleReconnectProof() pkt << (uint8) AUTH_RECONNECT_PROOF; pkt << (uint8) 0x00; pkt << (uint16) 0x00; // 2 bytes zeros - SendBuf((char const*)pkt.contents(), pkt.size()); + SendPacket(&pkt); ///- Set _authed to true! _authed = true; @@ -921,7 +971,7 @@ bool AuthSocket::_HandleRealmList() hdr << (uint16)pkt.size(); hdr.append(pkt); - SendBuf((char const*)hdr.contents(), hdr.size()); + SendPacket(&pkt); return true; } src/realmd/AuthSocket.cpp @@ -24,6 +24,7 @@ #define _AUTHSOCKET_H #include "Common.h" +#include "ByteBuffer.h" #include "Auth/BigNumber.h" #include "sockets/TcpSocket.h" #include "sockets/SocketHandler.h" @@ -55,6 +56,8 @@ class AuthSocket: public TcpSocket bool _HandleXferCancel(); bool _HandleXferAccept(); + void SendPacket(ByteBuffer* buf); + void _SetVSFields(const std::string& rI); FILE *pPatch; src/realmd/AuthSocket.h @@ -49,6 +49,10 @@ ConfVersion=2007062001 # Default: "Realmd.log" # "" - empty name disable creating log file # +# WorldLogFile +# Packet logging file for the realmserver +# Default: "world.log" +# # LogTimestamp # Logfile with timestamp of server start in name # Default: 0 - no timestamp in name @@ -105,6 +109,7 @@ PidFile = "" LogLevel = 0 LogTime = 0 LogFile = "Realmd.log" +WorldLogFile = "" LogTimestamp = 0 LogFileLevel = 0 LogColors = "" src/realmd/realmd.conf.dist.in @@ -225,9 +225,9 @@ void Log::Initialize() } charLogfile = openLogFile("CharLogFile","CharLogTimestamp","a"); - dberLogfile = openLogFile("DBErrorLogFile",NULL,"a"); raLogfile = openLogFile("RaLogFile",NULL,"a"); + worldLogfile = openLogFile("WorldLogFile",NULL,"a"); // Main log file settings m_includeTime = sConfig.GetBoolDefault("LogTime", false); @@ -698,6 +698,21 @@ void Log::outChar(const char * str, ... ) } } +void Log::outWorld( const char * str, ... ) +{ + if (!str) + return; + + if (worldLogfile) + { + va_list args; + va_start(args, str); + vfprintf(worldLogfile, str, args); + va_end(args); + fflush(worldLogfile); + } +} + void Log::outCharDump( const char * str, uint32 account_id, uint32 guid, const char * name ) { if(charLogfile) src/shared/Log.cpp @@ -80,6 +80,10 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th if (raLogfile != NULL) fclose(raLogfile); raLogfile = NULL; + + if (worldLogfile != NULL) + fclose(worldLogfile); + worldLogfile = NULL; } public: void Initialize(); @@ -106,6 +110,8 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th // any log level void outChar( const char * str, ... ) ATTR_PRINTF(2,3); // any log level + void outWorld( const char * str, ... ) ATTR_PRINTF(2,3); + // any log level void outCharDump( const char * str, uint32 account_id, uint32 guid, const char * name ); void outRALog( const char * str, ... ) ATTR_PRINTF(2,3); void SetLogLevel(char * Level); @@ -118,6 +124,7 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th uint32 getLogFilter() const { return m_logFilter; } bool IsOutDebug() const { return m_logLevel > 2 || (m_logFileLevel > 2 && logfile); } bool IsOutCharDump() const { return m_charLog_Dump; } + bool IsLogWorld() const { return (worldLogfile); } bool IsIncludeTime() const { return m_includeTime; } private: FILE* openLogFile(char const* configFileName,char const* configTimeStampFlag, char const* mode); @@ -128,6 +135,7 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th FILE* gmLogfile; FILE* charLogfile; FILE* dberLogfile; + FILE* worldLogfile; // log/console control uint32 m_logLevel; @@ -152,7 +160,7 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th #define sLog MaNGOS::Singleton<Log>::Instance() #ifdef MANGOS_DEBUG -#define DEBUG_LOG MaNGOS::Singleton<Log>::Instance().outDebug +#define DEBUG_LOG sLog.outDebug #else #define DEBUG_LOG #endif src/shared/Log.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8796" + #define REVISION_NR "8797" #endif // __REVISION_NR_H__ src/shared/revision_nr.h @@ -488,7 +488,6 @@ <ClCompile Include="..\..\src\game\WaypointMovementGenerator.cpp" /> <ClCompile Include="..\..\src\game\Weather.cpp" /> <ClCompile Include="..\..\src\game\World.cpp" /> - <ClCompile Include="..\..\src\game\WorldLog.cpp" /> <ClCompile Include="..\..\src\game\WorldSession.cpp" /> <ClCompile Include="..\..\src\game\WorldSocket.cpp" /> <ClCompile Include="..\..\src\game\WorldSocketMgr.cpp" /> @@ -621,7 +620,6 @@ <ClInclude Include="..\..\src\game\WaypointMovementGenerator.h" /> <ClInclude Include="..\..\src\game\Weather.h" /> <ClInclude Include="..\..\src\game\World.h" /> - <ClInclude Include="..\..\src\game\WorldLog.h" /> <ClInclude Include="..\..\src\game\WorldSession.h" /> <ClInclude Include="..\..\src\game\WorldSocket.h" /> <ClInclude Include="..\..\src\game\WorldSocketMgr.h" /> win/VC100/game.vcxproj @@ -1486,14 +1486,6 @@ > </File> <File - RelativePath="..\..\src\game\WorldLog.cpp" - > - </File> - <File - RelativePath="..\..\src\game\WorldLog.h" - > - </File> - <File RelativePath="..\..\src\game\WorldSession.cpp" > </File> win/VC80/game.vcproj @@ -1487,14 +1487,6 @@ > </File> <File - RelativePath="..\..\src\game\WorldLog.cpp" - > - </File> - <File - RelativePath="..\..\src\game\WorldLog.h" - > - </File> - <File RelativePath="..\..\src\game\WorldSession.cpp" > </File> win/VC90/game.vcproj src/game/WorldLog.cpp src/game/WorldLog.h 1798a48d5b65329ccf61c36dbe683d573dcb6fa9 XTZGZoReX xtzgzorex@gmail.com http://github.com/mangos/mangos/commit/d31768fbc6e105ec3d8e6e7b4301af8078d23f59 d31768fbc6e105ec3d8e6e7b4301af8078d23f59 2009-11-08T17:24:29-08:00 2009-11-08T17:24:12-08:00 [8797] Merge WorldLog class into Log class. * Added AuthSocket::SendPacket() function. * Packet logging now also possible in realmd. * realmd.conf.dist.in updated (added "WorldLogFile" setting). d5250d908d16ae3bee8543c706b35acd943b0340 XTZGZoReX xtzgzorex@gmail.com