mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Code Activity

fix log calls not outputting hex as it used to

Browse source
This commit is contained in:
NotAdam 2019-01-04 22:48:09 +11:00
parent c97ba162a4
commit ba803288a3
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/world/Network/GameConnection.cpp
View file

@ -220,14 +220,14 @@ void Sapphire::Network::GameConnection::handleZonePacket( Sapphire::Network::Pac
std::string name = itStr != m_zoneHandlerStrMap.end() ? itStr->second : "unknown";
// dont display packet notification if it is a ping or pos update, don't want the spam
if( opcode != PingHandler && opcode != UpdatePositionHandler )
Logger::debug( "[{0}] Handling Zone IPC : {1} ( {2:X} )", m_pSession->getId(), name, opcode );
Logger::debug( "[{0}] Handling Zone IPC : {1} ( {2:04X} )", m_pSession->getId(), name, opcode );
( this->*( it->second ) )( m_pFw, pPacket, *m_pSession->getPlayer() );
}
else
{
Logger::debug( "[{0}] Undefined Zone IPC : Unknown ( {1:X} )", m_pSession->getId(), opcode );
Logger::debug( "Dump: {0}", Util::binaryToHexDump( const_cast< uint8_t* >( &pPacket.data[ 0 ] ),
Logger::debug( "[{0}] Undefined Zone IPC : Unknown ( {1:04X} )", m_pSession->getId(), opcode );
Logger::debug( "Dump:\n{0}", Util::binaryToHexDump( const_cast< uint8_t* >( &pPacket.data[ 0 ] ),
pPacket.segHdr.size ) );
}
}
@ -243,13 +243,13 @@ void Sapphire::Network::GameConnection::handleChatPacket( Sapphire::Network::Pac
std::string name = itStr != m_chatHandlerStrMap.end() ? itStr->second : "unknown";
// dont display packet notification if it is a ping or pos update, don't want the spam
Logger::debug( "[{0}] Handling Chat IPC : {1} ( {2:X} )", m_pSession->getId(), name, opcode );
Logger::debug( "[{0}] Handling Chat IPC : {1} ( {2:04X} )", m_pSession->getId(), name, opcode );
( this->*( it->second ) )( m_pFw, pPacket, *m_pSession->getPlayer() );
}
else
{
Logger::debug( "[{0}] Undefined Chat IPC : Unknown ( {1:X} )", m_pSession->getId(), opcode );
Logger::debug( "[{0}] Undefined Chat IPC : Unknown ( {1:04X} )", m_pSession->getId(), opcode );
}
}

6
src/world/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -79,8 +79,8 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
const auto param4 = packet.data().param4;
const auto param5 = packet.data().param5;
Logger::debug( "[{0}] Incoming action: {1:#04X}\nparam1: {2:#016X}\nparam2: {3:#08X}\nparam3: {4:#016X}",
m_pSession->getId(), param1, param2, param3 );
Logger::debug( "[{0}] Incoming action: {1:04X}\nparam1: {2:016X}\nparam2: {3:08X}\nparam3: {4:016x}",
m_pSession->getId(), commandId, param1, param2, param3 );
//g_log.Log(LoggingSeverity::debug, "[" + std::to_string(m_pSession->getId()) + "] " + pInPacket->toString());
@ -490,7 +490,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
default:
{
Logger::debug( "[{0}] Unhandled action: {1:#04X}", m_pSession->getId(), commandId );
Logger::debug( "[{0}] Unhandled action: {1:04X}", m_pSession->getId(), commandId );
break;
}
}