BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

We can now send more data with UDP than previously, the splitting seems to work fine but receiving has some problems.

Browse Source
This commit is contained in:
Jocke
2016-03-09 18:26:33 +01:00
parent 3828616b60
commit 3209e36176
9 changed files with 161 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Network/UDPClient.cpp
+106 -23
View File
@@ -3,12 +3,10 @@
using namespace boost::asio::ip;
UDPClient::UDPClient()
{
}
{ }
UDPClient::~UDPClient()
{
}
{ }
void UDPClient::Connect(std::string playerName, std::string address, int port)
{
@@ -27,12 +25,18 @@ void UDPClient::Disconnect()
void UDPClient::Receive(Packet& packet)
{
int bytesRead = readBuffer();
if (bytesRead > 0) {
packet.ReconstructFromData(m_ReadBuffer, bytesRead);
}
// int bytesRead = readBuffer();
//if (bytesRead > 0) {
// packet.ReconstructFromData(m_ReadBuffer, bytesRead);
//}
}
void UDPClient::ReceivePackets()
{
readBuffer();
}
int UDPClient::readBuffer()
{
if (!m_Socket) {
@@ -40,36 +44,67 @@ int UDPClient::readBuffer()
}
boost::system::error_code error;
// Peek header
m_Socket->receive(boost
m_Socket->receive(boost
::asio::buffer((void*)m_ReadBuffer, 5 * sizeof(int)),
boost::asio::ip::udp::socket::message_peek, error);
boost::asio::ip::udp::socket::message_peek, error);
int sizeOfPacket = 0;
memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
int packetID = 0;
memcpy(&packetID, m_ReadBuffer + 4 * sizeof(int), sizeof(int));
if (sizeOfPacket == 0) {
return 0;
}
int packetGroup = 0;
memcpy(&packetGroup, m_ReadBuffer + sizeof(int), sizeof(int));
int packetGroupIndex = 0;
memcpy(&packetGroupIndex, m_ReadBuffer + 2 * sizeof(int), sizeof(int));
int packetGroupSize = 0;
memcpy(&packetGroupSize, m_ReadBuffer + 3 * sizeof(int), sizeof(int));
//LOG_INFO("Packet group: %i. Group index: %i. Group size: %i", packetGroup, packetGroupIndex, packetGroupSize);
//LOG_INFO("Packet size: %i.", sizeOfPacket);
if (sizeOfPacket > m_Socket->available()) {
LOG_WARNING("UDPClient::readBuffer(): We haven't got the whole packet yet.");
// return;
}
// if the buffer is to small increase the size of it
if (sizeOfPacket > m_BufferSize) {
delete[] m_ReadBuffer;
m_ReadBuffer = new char[sizeOfPacket];
m_BufferSize = sizeOfPacket;
}
boost::shared_ptr<char> packetData(new char[sizeOfPacket]);
// Read the message
size_t bytesReceived = m_Socket->receive_from(boost
::asio::buffer((void*)(m_ReadBuffer),
::asio::buffer((void*)(packetData.get()),
sizeOfPacket),
m_ReceiverEndpoint, 0, error);
if (error) {
//LOG_ERROR("receive: %s", error.message().c_str());
LOG_ERROR("receive: %s", error.message().c_str());
}
// Might want to do this earlier when i figure out a good way to
// remove data from network buffer.
if (hasReceivedPacket(packetGroup, packetGroupIndex)) {
return 0;
}
//std::map<unsigned int, std::vector<std::pair<unsigned int, boost::shared_ptr<char>>>> packetSegmentMap;
// If group exists
if (m_PacketSegmentMap.find(packetGroup) != m_PacketSegmentMap.end()) {
m_PacketSegmentMap.at(packetGroup).push_back(std::make_pair(packetGroupIndex, std::move(packetData)));
} else { // Create group and add element
m_PacketSegmentMap[packetGroup].push_back(std::make_pair(packetGroupIndex, std::move(packetData)));
}
// new char [sizeOfPacket] save in map with packetID as key
return bytesReceived;
}
bool UDPClient::hasReceivedPacket(int packetGroup, int groupIndex)
{
if (m_PacketSegmentMap.find(packetGroup) != m_PacketSegmentMap.end()) {
const std::vector<std::pair<int, boost::shared_ptr<char>>>& loopPacketGroup = m_PacketSegmentMap.at(packetGroup);
for (size_t i = 0; i < loopPacketGroup.size(); i++) {
if (loopPacketGroup.at(i).first == groupIndex) {
return true;
}
}
}
return false;
}
void UDPClient::Send(Packet& packet)
{
packet.UpdateSize();
@@ -77,7 +112,7 @@ void UDPClient::Send(Packet& packet)
packet.Data(),
packet.Size()),
m_ReceiverEndpoint, 0);
}
}
void UDPClient::Broadcast(Packet& packet, int port)
{
@@ -93,8 +128,56 @@ void UDPClient::Broadcast(Packet& packet, int port)
bool UDPClient::IsSocketAvailable()
{
if (!m_Socket) {
if (!m_Socket) {
return false;
}
return m_Socket->available();
}
}
bool UDPClient::GetNextPacket(Packet & packet)
{
// A duplicate packet should not be present in the vector!
// Soo we will assume that this is true and only look if size
// of vector is correct.
std::map<unsigned int, std::vector<std::pair<int, boost::shared_ptr<char>>>>::iterator it = m_PacketSegmentMap.begin();
while (it != m_PacketSegmentMap.end()) {
// pair(Group index, packetData)
std::vector<std::pair<int, boost::shared_ptr<char>>>& currentVector = it->second;
Packet headerInfoPacket(currentVector.at(0).second.get(), packet.HeaderSize());
int groupSize = headerInfoPacket.GroupSize();
//LOG_INFO("UDPClient::GetNextPacket: Packet group : %i.Group index : %i.Group size : %i. lastReceivedSnapshotGroup: %i. MessageType(Ples 4): %i", headerInfoPacket.Group(), headerInfoPacket.GroupIndex(), groupSize, lastReceivedSnapshotGroup, headerInfoPacket.GetMessageType());
//LOG_INFO("UDPClient::GetNextPacket: Packet group : %i.lastReceivedSnapshotGroup: %i. MessageType(Ples 4): %i", headerInfoPacket.Group(), lastReceivedSnapshotGroup, headerInfoPacket.GetMessageType());
int mapSize = m_PacketSegmentMap.size();
if (mapSize > 5) {
it = m_PacketSegmentMap.erase(it);
LOG_INFO("The map is increasing in size, size is %i", mapSize);
continue;
}
if (headerInfoPacket.GetMessageType() == MessageType::Snapshot && lastReceivedSnapshotGroup > headerInfoPacket.Group()) {
it = m_PacketSegmentMap.erase(it);
continue;
//LOG_INFO("Deleted old entry");
}
if (currentVector.size() == groupSize) {
std::sort(currentVector.begin(), currentVector.end());
// Add the first packet in vector
packet.ReconstructFromData(currentVector.at(0).second.get(), packet.HeaderSize());
// Add the rest of the packets.
int sizeOfData = 0;
for (size_t i = 0; i < currentVector.size(); i++) {
memcpy(&sizeOfData, currentVector.at(i).second.get(), sizeof(int));
packet.WriteData(currentVector.at(i).second.get() + packet.HeaderSize(), sizeOfData - packet.HeaderSize());
}
if (headerInfoPacket.GetMessageType() == MessageType::Snapshot) {
lastReceivedSnapshotGroup = packet.Group();
}
// No need to get next it as we are returning.
//LOG_INFO("Packet parsed");
m_PacketSegmentMap.erase(it);
return true;
} else {
++it;
}
}
return false;
}