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

incoming packet deserialization

Browse source
This commit is contained in:
NotAdam 2018-07-06 19:47:35 +10:00
parent a322e81a53
commit 98bb3eb436
3 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/Network/GamePacketNew.h
View file

@ -178,6 +178,18 @@ public:
initialize(); initialize();
}; };
FFXIVIpcPacket< T, T1 >( const FFXIVARR_PACKET_RAW& rawPacket )
{
auto segHdrSize = sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
auto copySize = std::min< uint32_t >( sizeof( T ), rawPacket.segHdr.size - segHdrSize );
memcpy( &m_segHdr, &rawPacket.segHdr, segHdrSize );
memcpy( &m_data, &rawPacket.data[0] + segHdrSize, copySize );
memset( &m_ipcHdr, 0, sizeof( FFXIVARR_IPC_HEADER ) );
m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
}
uint32_t getContentSize() override uint32_t getContentSize() override
{ {
return sizeof( FFXIVARR_IPC_HEADER ) + sizeof( T ); return sizeof( FFXIVARR_IPC_HEADER ) + sizeof( T );

26
src/common/Network/PacketDef/Zone/ClientZoneDef.h Normal file
View file

@ -0,0 +1,26 @@
#ifndef _CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H
#define _CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H
#include <Common.h>
#include <Network/CommonNetwork.h>
namespace Core {
namespace Network {
namespace Packets {
namespace Client {
struct FFXIVIpcGmCommand1 : FFXIVIpcBasePacket< GMCommand1 >
{
/* 0000 */ uint32_t commandId;
/* 0004 */ uint32_t param1;
/* 0008 */ uint32_t param2;
/* 000C */ char unknown_C[28];
/* 0028 */ uint32_t param3;
};
}
}
}
}
#endif //_CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H

12
src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
View file

@ -6,6 +6,7 @@
#include <Logging/Logger.h> #include <Logging/Logger.h>
#include <Network/PacketContainer.h> #include <Network/PacketContainer.h>
#include <Network/CommonActorControl.h> #include <Network/CommonActorControl.h>
#include <Network/PacketDef/Zone/ClientZoneDef.h>
#include <unordered_map> #include <unordered_map>
@ -91,12 +92,11 @@ void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_R
if( player.getGmRank() <= 0 ) if( player.getGmRank() <= 0 )
return; return;
Packets::FFXIVARR_PACKET_RAW copy = inPacket; auto packet = ZoneChannelPacket< Client::FFXIVIpcGmCommand1 >( inPacket );
auto commandId = *reinterpret_cast< uint32_t* >( &copy.data[0x10] ); auto commandId = packet.data().commandId;
auto param1 = packet.data().param1;
uint32_t param1 = *reinterpret_cast< uint32_t* >( &copy.data[0x14] ); auto param2 = packet.data().param2;
uint32_t param2 = *reinterpret_cast< uint32_t* >( &copy.data[0x18] ); auto param3 = packet.data().param3;
uint32_t param3 = *reinterpret_cast< uint32_t* >( &copy.data[0x28] );
auto pLog = g_fw.get< Logger >(); auto pLog = g_fw.get< Logger >();
pLog->debug( player.getName() + " used GM1 commandId: " + std::to_string( commandId ) + pLog->debug( player.getName() + " used GM1 commandId: " + std::to_string( commandId ) +