edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cancel connection process when server is unreachable. closes #1975

Browse source
This commit is contained in:
oy 2019-01-17 17:52:33 +01:00
parent fbc61d22fc
commit 9d08f62558
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/shared/network_conn.cpp
View file

@ -196,6 +196,7 @@ int CNetConnection::Connect(NETADDR *pAddr)
// init connection // init connection
Reset(); Reset();
m_LastRecvTime = time_get();
m_PeerAddr = *pAddr; m_PeerAddr = *pAddr;
m_PeerToken = NET_TOKEN_NONE; m_PeerToken = NET_TOKEN_NONE;
SetToken(GenerateToken(pAddr)); SetToken(GenerateToken(pAddr));
@ -378,6 +379,11 @@ int CNetConnection::Update()
m_State = NET_CONNSTATE_ERROR; m_State = NET_CONNSTATE_ERROR;
SetError("Timeout"); SetError("Timeout");
} }
else if(State() == NET_CONNSTATE_TOKEN && (Now - m_LastRecvTime) > time_freq() * 5)
{
m_State = NET_CONNSTATE_ERROR;
SetError("Unable to connect to the server");
}
// fix resends // fix resends
if(m_Buffer.First()) if(m_Buffer.First())