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

fix PacketContainer entrylist type;

Browse source
This commit is contained in:
Maru 2018-06-27 23:48:18 -03:00
parent 671576b861
commit f3c71b0076
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Forwards.h
View file

@ -24,8 +24,10 @@ namespace Core
namespace Packets namespace Packets
{ {
class GamePacket; class GamePacket;
class FFXIVPacketBase;
typedef boost::shared_ptr< GamePacket > GamePacketPtr; typedef boost::shared_ptr< GamePacket > GamePacketPtr;
typedef boost::shared_ptr< FFXIVPacketBase > FFXIVPacketBasePtr;
} }
} }

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

@ -80,6 +80,7 @@ public:
virtual std::vector< uint8_t > getData() const virtual std::vector< uint8_t > getData() const
{ {
std::cout << "konichiwa bitches" << std::endl;
return {}; return {};
} }

11
src/common/Network/PacketContainer.cpp
View file

@ -1,6 +1,7 @@
#include "PacketContainer.h" #include "PacketContainer.h"
#include "Common.h" #include "Common.h"
#include "Forwards.h"
#include <boost/format.hpp> #include <boost/format.hpp>
@ -19,11 +20,11 @@ Core::Network::Packets::PacketContainer::~PacketContainer()
m_entryList.clear(); m_entryList.clear();
} }
void Core::Network::Packets::PacketContainer::addPacket( FFXIVPacketBase entry ) void Core::Network::Packets::PacketContainer::addPacket( Core::Network::Packets::FFXIVPacketBasePtr entry )
{ {
m_entryList.push_back( entry ); m_entryList.push_back( entry );
m_ipcHdr.size += entry.getSize(); m_ipcHdr.size += entry->getSize();
m_ipcHdr.count++; m_ipcHdr.count++;
} }
@ -50,9 +51,9 @@ void Core::Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8
for( ; it != m_entryList.end(); ++it ) for( ; it != m_entryList.end(); ++it )
{ {
auto data = it->getData(); auto data = (*it)->getData();
memcpy( &tempBuffer[0] + sizeof( FFXIVARR_PACKET_HEADER ) + offset, &data[0], it->getSize() ); memcpy( &tempBuffer[0] + sizeof( FFXIVARR_PACKET_HEADER ) + offset, &data[0], (*it)->getSize() );
offset += it->getSize(); offset += (*it)->getSize();
} }
sendBuffer.assign( &tempBuffer[0], &tempBuffer[0] + m_ipcHdr.size ); sendBuffer.assign( &tempBuffer[0], &tempBuffer[0] + m_ipcHdr.size );

4
src/common/Network/PacketContainer.h
View file

@ -19,11 +19,11 @@ public:
PacketContainer(); PacketContainer();
~PacketContainer(); ~PacketContainer();
void addPacket( FFXIVPacketBase entry ); void addPacket( FFXIVPacketBasePtr entry );
FFXIVARR_PACKET_HEADER m_ipcHdr; FFXIVARR_PACKET_HEADER m_ipcHdr;
std::vector< FFXIVPacketBase > m_entryList; std::vector< FFXIVPacketBasePtr > m_entryList;
std::string toString(); std::string toString();

4
src/servers/sapphire_zone/Network/GameConnection.cpp
View file

@ -303,7 +303,7 @@ void Core::Network::GameConnection::processOutQueue()
break; break;
} }
pRP.addPacket( *pPacket ); pRP.addPacket( pPacket );
totalSize += pPacket->getSize(); totalSize += pPacket->getSize();
} }
@ -315,7 +315,7 @@ void Core::Network::GameConnection::processOutQueue()
void Core::Network::GameConnection::sendSinglePacket( Core::Network::Packets::FFXIVPacketBasePtr pPacket ) void Core::Network::GameConnection::sendSinglePacket( Core::Network::Packets::FFXIVPacketBasePtr pPacket )
{ {
PacketContainer pRP = PacketContainer(); PacketContainer pRP = PacketContainer();
pRP.addPacket( *pPacket ); pRP.addPacket( pPacket );
sendPackets( &pRP ); sendPackets( &pRP );
} }