pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get Logs::Client_Server_Packet_Unhandled to show raw opcodes

Browse Source
This commit is contained in:
Akkadius 2015-02-01 19:56:32 -06:00
parent f9ba99e99f
commit 774e429d87
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/eq_stream.cpp
View File

@ -563,7 +563,7 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
if (Log.log_settings[Logs::Server_Client_Packet].is_category_enabled == 1){ if (Log.log_settings[Logs::Server_Client_Packet].is_category_enabled == 1){
if (p->GetOpcode() != OP_SpecialMesg){ if (p->GetOpcode() != OP_SpecialMesg){
Log.Out(Logs::General, Logs::Server_Client_Packet, "[%s - 0x%04x] [Size: %u] \n %s", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size(), DumpPacketToString(p).c_str()); Log.Out(Logs::General, Logs::Server_Client_Packet, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size(), DumpPacketToString(p).c_str());
} }
} }
@ -961,14 +961,15 @@ EQRawApplicationPacket *p=nullptr;
MInboundQueue.unlock(); MInboundQueue.unlock();
//resolve the opcode if we can. //resolve the opcode if we can.
if(p) { if (Log.log_settings[Logs::Client_Server_Packet_Unhandled].is_category_enabled == 1){
if(OpMgr != nullptr && *OpMgr != nullptr) { if (p) {
EmuOpcode emu_op = (*OpMgr)->EQToEmu(p->opcode); if (OpMgr != nullptr && *OpMgr != nullptr) {
if (emu_op == OP_Unknown) { EmuOpcode emu_op = (*OpMgr)->EQToEmu(p->opcode);
Log.Out(Logs::General, Logs::Netcode, "[ERROR] Unable to convert EQ opcode 0x%.4x to an Application opcode.", p->opcode); if (emu_op == OP_Unknown) {
// Log.Out(Logs::General, Logs::Client_Server_Packet_Unhandled, "Unknown :: [%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->opcode, p->Size(), DumpPacketToString(p).c_str());
}
p->SetOpcode(emu_op);
} }
p->SetOpcode(emu_op);
} }
} }

3
common/packet_dump.cpp
View File

@ -94,6 +94,9 @@ std::string DumpPacketHexToString(const uchar* buf, uint32 size, uint32 cols, ui
std::ostringstream out; std::ostringstream out;
if (size == 0 || size > 39565) if (size == 0 || size > 39565)
return ""; return "";
out << "\n";
// Output as HEX // Output as HEX
char output[4]; char output[4];
int j = 0; int j = 0;

12
zone/client_packet.cpp
View File

@ -405,7 +405,7 @@ int Client::HandlePacket(const EQApplicationPacket *app)
} }
if (Log.log_settings[Logs::Client_Server_Packet].is_category_enabled == 1) if (Log.log_settings[Logs::Client_Server_Packet].is_category_enabled == 1)
Log.Out(Logs::General, Logs::Client_Server_Packet, "[%s - 0x%04x] [Size: %u] \n %s", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size(), DumpPacketToString(app).c_str()); Log.Out(Logs::General, Logs::Client_Server_Packet, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size(), DumpPacketToString(app).c_str());
EmuOpcode opcode = app->GetOpcode(); EmuOpcode opcode = app->GetOpcode();
if (opcode == OP_AckPacket) { if (opcode == OP_AckPacket) {
@ -448,14 +448,16 @@ int Client::HandlePacket(const EQApplicationPacket *app)
case CLIENT_CONNECTED: { case CLIENT_CONNECTED: {
ClientPacketProc p; ClientPacketProc p;
p = ConnectedOpcodes[opcode]; p = ConnectedOpcodes[opcode];
if(p == nullptr) { if(p == nullptr) {
std::vector<EQEmu::Any> args; std::vector<EQEmu::Any> args;
args.push_back(const_cast<EQApplicationPacket*>(app)); args.push_back(const_cast<EQApplicationPacket*>(app));
parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 0, &args); parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 0, &args);
if (Log.log_settings[Logs::Client_Server_Packet_Unhandled].is_category_enabled == 1) if (Log.log_settings[Logs::Client_Server_Packet_Unhandled].is_category_enabled == 1){
Log.Out(Logs::General, Logs::Client_Server_Packet_Unhandled, "Incoming OpCode :: [%s - 0x%04x] [Size: %u] \n%s", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size(), DumpPacketToString(app).c_str()); char buffer[64];
app->build_header_dump(buffer);
Log.Out(Logs::General, Logs::Client_Server_Packet_Unhandled, "%s %s", buffer, DumpPacketToString(app).c_str());
}
break; break;
} }