From f6acb8540da3bf1cfc122279f1fd4dd6a960420d Mon Sep 17 00:00:00 2001
From: Alice Ogeda <alice.ogeda.s@gmail.com>
Date: Mon, 13 Feb 2023 22:32:43 -0300
Subject: [PATCH] align packets in containers to 8 byte boundary;

---
 src/common/Network/GamePacket.h        | 23 +++++++++++++++-----
 src/common/Network/PacketContainer.cpp | 30 +++++++++++++++++++-------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index 7de8afff..672722b8 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -90,11 +90,6 @@ namespace Sapphire::Network::Packets
       setTargetActor( targetActorId );
     }
 
-    std::size_t getSize() const
-    {
-      return m_segHdr.size;
-    }
-
     virtual std::vector< uint8_t > getData() const
     {
       return {};
@@ -124,6 +119,24 @@ namespace Sapphire::Network::Packets
       return m_segmentType;
     }
 
+    /**
+    * @brief gets current packet size
+    * @return packet size in bytes
+    */
+    std::size_t getSize() const
+    {
+      return m_segHdr.size;
+    }
+
+    /**
+    * @brief sets current packet size
+    * @param packet size in bytes
+    */
+    void setSize( std::size_t packetSize )
+    {
+      m_segHdr.size = packetSize;
+    }
+
     /**
     * @brief Sets the source actor id for this packet.
     * @param actorId The source actor id.
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index 0b6fa1b1..cb308b31 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -43,14 +43,9 @@ void Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >&
   m_ipcHdr.timestamp = tick;
   m_ipcHdr.unknown_20 = 1;
 
-  memcpy( &tempBuffer[ 0 ], &m_ipcHdr, sizeof( FFXIVARR_PACKET_HEADER ) );
-
   auto it = m_entryList.begin();
   std::size_t offset = 0;
 
-  if( m_entryList.size() > 1 )
-    offset = 0;
-
   for( ; it != m_entryList.end(); ++it )
   {
     auto pPacket = ( *it );
@@ -60,13 +55,32 @@ void Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >&
       pPacket->setTargetActor( m_segmentTargetOverride );
     }
 
+    auto validPacketDataSize = pPacket->getSize();
+
+    // check if packet is 8 byte aligned
+    auto alignCheck = validPacketDataSize % 8;
+    if( alignCheck != 0 )
+    {
+      // pad packet to boundary
+      // resize is expensive
+      tempBuffer.resize( tempBuffer.size() + alignCheck, 0 );
+
+      pPacket->setSize( validPacketDataSize + alignCheck );
+    }
+
+    // copy packet data into buffer
     auto data = pPacket->getData();
-    memcpy( &tempBuffer[ 0 ] + sizeof( FFXIVARR_PACKET_HEADER ) + offset, &data[ 0 ], pPacket->getSize() );
-    offset += pPacket->getSize();
+    memcpy( &tempBuffer[ 0 ] + sizeof( FFXIVARR_PACKET_HEADER ) + offset, &data[ 0 ], validPacketDataSize );
+
+    offset += validPacketDataSize + alignCheck;
   }
 
-  sendBuffer.assign( &tempBuffer[ 0 ], &tempBuffer[ 0 ] + m_ipcHdr.size );
+  // buffer has possibly been resized for alignment
+  m_ipcHdr.size = tempBuffer.size();
 
+  memcpy( &tempBuffer[ 0 ], &m_ipcHdr, sizeof( FFXIVARR_PACKET_HEADER ) );
+
+  sendBuffer.assign( &tempBuffer[ 0 ], &tempBuffer[ 0 ] + m_ipcHdr.size );
 }
 
 std::string Network::Packets::PacketContainer::toString()