Added sequnceNumber and totalNumberOfPackets to packet for packet splitting.
This commit is contained in:
@@ -16,7 +16,8 @@ public:
|
||||
Packet(char* data, const size_t sizeOfPacket);
|
||||
Packet(MessageType type);
|
||||
~Packet();
|
||||
void Init(MessageType type, unsigned int& packetID);
|
||||
void Init(MessageType type, unsigned int& packetID,
|
||||
int sequenceNumber, int totalAmountOfPackets);
|
||||
|
||||
// Add primitive types like int, float, char...
|
||||
template<typename T>
|
||||
|
||||
@@ -102,8 +102,12 @@ void Client::Update()
|
||||
|
||||
void Client::parseMessageType(Packet& packet)
|
||||
{
|
||||
// Pop packetSize
|
||||
// Pop packetSize, sequenceNumber and packetsInSequence.
|
||||
// create a packet of the correct size
|
||||
packet.ReadPrimitive<int>();
|
||||
packet.ReadPrimitive<int>();
|
||||
packet.ReadPrimitive<int>();
|
||||
|
||||
int messageType = packet.ReadPrimitive<int>();
|
||||
if (messageType == -1)
|
||||
return;
|
||||
@@ -164,8 +168,11 @@ void Client::parseUDPConnect(Packet& packet)
|
||||
void Client::parseTCPConnect(Packet& packet)
|
||||
{
|
||||
LOG_INFO("Received TCP connect from server");
|
||||
// Pop size of message int
|
||||
// Pop packetSize, sequenceNumber and packetsInSequence.
|
||||
packet.ReadPrimitive<int>();
|
||||
packet.ReadPrimitive<int>();
|
||||
packet.ReadPrimitive<int>();
|
||||
|
||||
int messageType = packet.ReadPrimitive<int>();
|
||||
// Read packet ID
|
||||
m_PreviousPacketID = m_PacketID; // Set previous packet id
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Packet::Packet(MessageType type, unsigned int& packetID)
|
||||
{
|
||||
m_Data = new char[m_MaxPacketSize];
|
||||
Init(type, packetID);
|
||||
Init(type, packetID, 1, 1);
|
||||
}
|
||||
|
||||
// Create message
|
||||
@@ -21,7 +21,7 @@ Packet::Packet(MessageType type)
|
||||
{
|
||||
m_Data = new char[m_MaxPacketSize];
|
||||
unsigned int dummy = 0;
|
||||
Init(type, dummy);
|
||||
Init(type, dummy, 1, 1);
|
||||
}
|
||||
|
||||
Packet::~Packet()
|
||||
@@ -29,13 +29,17 @@ Packet::~Packet()
|
||||
delete[] m_Data;
|
||||
}
|
||||
|
||||
void Packet::Init(MessageType type, unsigned int & packetID)
|
||||
void Packet::Init(MessageType type, unsigned int & packetID,
|
||||
int sequenceNumber, int totalAmountOfPackets)
|
||||
{
|
||||
m_ReturnDataOffset = 0;
|
||||
m_Offset = 0;
|
||||
// Create message header
|
||||
// allocate memory for size of packet(only used in tcp)
|
||||
// allocate memory for size of packet, sequenceNumber and totalPacketesInSequence
|
||||
WritePrimitive<int>(0);
|
||||
WritePrimitive(sequenceNumber);
|
||||
WritePrimitive(totalAmountOfPackets);
|
||||
// If you add things before here be sure to change in GetMessageType()
|
||||
// Add message type
|
||||
int messageType = static_cast<int>(type);
|
||||
WritePrimitive<int>(messageType);
|
||||
@@ -129,7 +133,7 @@ void Packet::ChangePacketID(unsigned int & packetID)
|
||||
MessageType Packet::GetMessageType()
|
||||
{
|
||||
MessageType messagType;
|
||||
memcpy(&messagType, m_Data + sizeof(int), sizeof(int));
|
||||
memcpy(&messagType, m_Data + 3 * sizeof(int), sizeof(int));
|
||||
return messagType;
|
||||
}
|
||||
|
||||
|
||||
@@ -107,9 +107,11 @@ void Server::Update()
|
||||
|
||||
void Server::parseMessageType(Packet& packet)
|
||||
{
|
||||
// Pop packetSize which is used by TCP Client to
|
||||
// Pop packetSize, sequenceNumber and packetsInSequence.
|
||||
// create a packet of the correct size
|
||||
packet.ReadPrimitive<int>();
|
||||
packet.ReadPrimitive<int>();
|
||||
packet.ReadPrimitive<int>();
|
||||
|
||||
int messageType = packet.ReadPrimitive<int>(); // Read what type off message was sent from server
|
||||
// Read packet ID
|
||||
@@ -322,7 +324,9 @@ void Server::checkForTimeOuts()
|
||||
|
||||
//void Server::parseUDPConnect(Packet & packet)
|
||||
//{
|
||||
// // Pop size of message int
|
||||
// Pop packetSize, sequenceNumber and packetsInSequence.
|
||||
//packet.ReadPrimitive<int>();
|
||||
//packet.ReadPrimitive<int>();
|
||||
//packet.ReadPrimitive<int>();
|
||||
// int messageType = packet.ReadPrimitive<int>();
|
||||
// // Read packet ID
|
||||
@@ -345,8 +349,11 @@ void Server::checkForTimeOuts()
|
||||
|
||||
void Server::parseTCPConnect(Packet & packet)
|
||||
{
|
||||
// Pop size of message int
|
||||
// Pop packetSize, sequenceNumber and packetsInSequence.
|
||||
packet.ReadPrimitive<int>();
|
||||
packet.ReadPrimitive<int>();
|
||||
packet.ReadPrimitive<int>();
|
||||
|
||||
int messageType = packet.ReadPrimitive<int>();
|
||||
// Read packet ID
|
||||
m_PreviousPacketID = m_PacketID; // Set previous packet id
|
||||
|
||||
Reference in New Issue
Block a user