mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-10 04:37:45 +00:00
Code Activity

Added a util function to get opCode from RAW_PACKET

Browse source
This commit is contained in:
Mordred 2021-12-06 00:39:22 +01:00
parent faff95ac09
commit 147ebedfde
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/Util/Util.cpp
View file

@ -19,6 +19,12 @@ std::string Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
return outStr; return outStr;
} }
uint16_t Util::getOpCode( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& raw )
{
return *reinterpret_cast< uint16_t* >( &raw.data[ 2 ] );
}
std::string Util::toLowerCopy( const std::string& inStr ) std::string Util::toLowerCopy( const std::string& inStr )
{ {
std::string out = inStr; std::string out = inStr;

3
src/common/Util/Util.h
View file

@ -4,10 +4,13 @@
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#include <functional> #include <functional>
#include <Network/CommonNetwork.h>
namespace Sapphire::Common::Util namespace Sapphire::Common::Util
{ {
uint16_t getOpCode( Network::Packets::FFXIVARR_PACKET_RAW& raw );
std::string binaryToHexString( uint8_t* pBinData, uint16_t size ); std::string binaryToHexString( uint8_t* pBinData, uint16_t size );
std::string binaryToHexDump( uint8_t* pBinData, uint16_t size ); std::string binaryToHexDump( uint8_t* pBinData, uint16_t size );

5
src/lobby/GameConnection.cpp
View file

@ -23,6 +23,7 @@
#include "Forwards.h" #include "Forwards.h"
using namespace Sapphire; using namespace Sapphire;
using namespace Sapphire::Common;
using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets;
using namespace Sapphire::Network::Packets::LobbyPackets; using namespace Sapphire::Network::Packets::LobbyPackets;
using namespace Sapphire::Network::Packets::LobbyPackets::Server; using namespace Sapphire::Network::Packets::LobbyPackets::Server;
@ -478,9 +479,9 @@ void Lobby::GameConnection::handleGamePacket( Network::Packets::FFXIVARR_PACKET_
if( m_pSession ) if( m_pSession )
accountId = m_pSession->getAccountID(); accountId = m_pSession->getAccountID();
Logger::info( "[accountId#{0}] OpCode {1}", accountId, *reinterpret_cast< uint16_t* >( &packet.data[ 2 ] ) ); Logger::info( "[accountId#{0}] OpCode {1}", accountId, Util::getOpCode( packet ) );
switch( *reinterpret_cast< uint16_t* >( &packet.data[ 2 ] ) ) switch( Util::getOpCode( packet ) )
{ {
case LoginEx: case LoginEx:
{ {

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

@ -228,7 +228,7 @@ void Sapphire::Network::GameConnection::queueOutPacket( std::vector< Packets::FF
void Sapphire::Network::GameConnection::handleZonePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ) void Sapphire::Network::GameConnection::handleZonePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket )
{ {
uint16_t opcode = *reinterpret_cast< uint16_t* >( &pPacket.data[ 0x02 ] ); uint16_t opcode = Util::getOpCode( pPacket );
auto it = m_zoneHandlerMap.find( opcode ); auto it = m_zoneHandlerMap.find( opcode );
if( it != m_zoneHandlerMap.end() ) if( it != m_zoneHandlerMap.end() )
@ -259,7 +259,7 @@ void Sapphire::Network::GameConnection::handleZonePacket( Sapphire::Network::Pac
void Sapphire::Network::GameConnection::handleChatPacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ) void Sapphire::Network::GameConnection::handleChatPacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket )
{ {
uint16_t opcode = *reinterpret_cast< uint16_t* >( &pPacket.data[ 0x02 ] ); uint16_t opcode = Util::getOpCode( pPacket );
auto it = m_chatHandlerMap.find( opcode ); auto it = m_chatHandlerMap.find( opcode );
if( it != m_chatHandlerMap.end() ) if( it != m_chatHandlerMap.end() )