diff --git a/common/eq_stream.cpp b/common/eq_stream.cpp index aa08070bb..cdb2e9d26 100644 --- a/common/eq_stream.cpp +++ b/common/eq_stream.cpp @@ -1112,7 +1112,7 @@ uint32 newlength=0; ProcessQueue(); } else { Log.Out(Logs::Detail, Logs::Netcode, _L "Incoming packet failed checksum" __L); - _hex(NET__NET_CREATE_HEX, buffer, length); + Log.Hex(Logs::Netcode, buffer, length); } } diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index b8302fe20..e790e3830 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -24,6 +24,7 @@ #include "database.h" #include "misc.h" + #include #include #include @@ -173,7 +174,7 @@ void EQEmuLogSys::Hex(uint16 log_category, const void *data, unsigned long lengt // log_message(type, "%s", buffer); //%s is to prevent % escapes in the ascii } } - +/* void EQEmuLogSys::Raw(uint16 log_category, uint16 seq, const BasePacket *p) { return; char buffer[196]; @@ -181,7 +182,7 @@ void EQEmuLogSys::Raw(uint16 log_category, uint16 seq, const BasePacket *p) { //log_message(type,buffer); EQEmuLogSys::Hex(log_category, (const char *)p->pBuffer, p->size); } - +*/ void EQEmuLogSys::Out(Logs::DebugLevel debug_level, uint16 log_category, std::string message, ...) { va_list args; diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 5288128fc..57562b904 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -129,8 +129,7 @@ public: void MakeDirectory(std::string directory_name); void SetCurrentTimeStamp(char* time_stamp); void StartFileLogs(const std::string log_name); - void Hex(uint16 log_category, const void *data, unsigned long length, unsigned char padding); - void Raw(uint16 log_category, uint16 seq, const BasePacket *p); + void Hex(uint16 log_category, const void *data, unsigned long length, unsigned char padding = 4); struct LogSettings{ uint8 log_to_file; diff --git a/common/logsys.cpp b/common/logsys.cpp index 8e56ea9d7..f1fa6ed53 100644 --- a/common/logsys.cpp +++ b/common/logsys.cpp @@ -46,7 +46,16 @@ const LogTypeStatus *log_type_info = real_log_type_info; -z +void log_hex(LogType type, const void *data, unsigned long length, unsigned char padding) { + if(!is_log_enabled(type)) + return; + char buffer[80]; + uint32 offset; + for(offset=0;offsetPopPacket())) { - _hex(WORLD__ZONE_TRACE,pack->pBuffer,pack->size); + Log.Hex(Logs::Netcode, pack->pBuffer, pack->size); if (!authenticated) { if (WorldConfig::get()->SharedKey.length() > 0) { if (pack->opcode == ServerOP_ZAAuth && pack->size == 16) { diff --git a/world/login_server.cpp b/world/login_server.cpp index 0bec7cef3..20ca570c0 100644 --- a/world/login_server.cpp +++ b/world/login_server.cpp @@ -97,7 +97,7 @@ bool LoginServer::Process() { while((pack = tcpc->PopPacket())) { Log.Out(Logs::Detail, Logs::World_Server,"Recevied ServerPacket from LS OpCode 0x04x",pack->opcode); - _hex(WORLD__LS_TRACE,pack->pBuffer,pack->size); + Log.Hex(Logs::Netcode, pack->pBuffer, pack->size); switch(pack->opcode) { case 0: diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 94b1e8853..85840cba4 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -177,7 +177,7 @@ bool ZoneServer::Process() { } ServerPacket *pack = 0; while((pack = tcpc->PopPacket())) { - _hex(WORLD__ZONE_TRACE,pack->pBuffer,pack->size); + Log.Hex(Logs::Netcode, pack->pBuffer, pack->size); if (!authenticated) { if (WorldConfig::get()->SharedKey.length() > 0) { if (pack->opcode == ServerOP_ZAAuth && pack->size == 16) { diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 468dc88c0..2efaa5a98 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -141,7 +141,7 @@ void WorldServer::Process() { ServerPacket *pack = 0; while((pack = tcpc.PopPacket())) { Log.Out(Logs::Detail, Logs::Zone_Server, "Got 0x%04x from world:", pack->opcode); - _hex(ZONE__WORLD_TRACE,pack->pBuffer,pack->size); + Log.Hex(Logs::Netcode, pack->pBuffer, pack->size); switch(pack->opcode) { case 0: { break;