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

Reliable message should now be working, further testing is to be done.

Browse Source
This commit is contained in:
Jocke
2016-02-10 16:16:56 +01:00
parent 2ec30fd2b2
commit 4f2ad3ad00
9 changed files with 160 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Network/TCPServer.cpp
+5 -4
View File
@@ -23,8 +23,8 @@ PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& con
boost::asio::ip::address address, unsigned short port)
{
for (auto& kv : connectedPlayers) {
if (kv.second.Address == address &&
kv.second.Port == port) {
if (kv.second.TCPAddress == address &&
kv.second.TCPPort == port) {
return kv.first;
}
}
@@ -43,8 +43,8 @@ void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket,
PlayerDefinition pd;
pd.StopTime = std::clock();
pd.TCPSocket = socket;
pd.Address = socket.get()->remote_endpoint().address();
pd.Port = socket.get()->remote_endpoint().port();
pd.TCPAddress = socket.get()->remote_endpoint().address();
pd.TCPPort = socket.get()->remote_endpoint().port();
connectedPlayers[nextPlayerID++] = pd;
}
}
@@ -78,6 +78,7 @@ void TCPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
if (bytesRead > 0) {
packet.ReconstructFromData(m_ReadBuffer, bytesRead);
}
lastReceivedSocket = playerDefinition.TCPSocket;
}
int TCPServer::readBuffer(char* data, PlayerDefinition & playerDefinition)