From 2bdc6a1f4d59ebe97a163de640a73a2c103d7c23 Mon Sep 17 00:00:00 2001 From: def Date: Sat, 16 Aug 2014 15:43:49 +0200 Subject: [PATCH] Some more tries to fix timeout stuff --- src/engine/shared/network_conn.cpp | 3 +-- src/engine/shared/network_server.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/engine/shared/network_conn.cpp b/src/engine/shared/network_conn.cpp index 1263eef55..87fe69628 100644 --- a/src/engine/shared/network_conn.cpp +++ b/src/engine/shared/network_conn.cpp @@ -239,9 +239,8 @@ int CNetConnection::Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr) } else { - if(State() == NET_CONNSTATE_OFFLINE || State() == NET_CONNSTATE_ERROR) + if(State() == NET_CONNSTATE_OFFLINE) { - m_State = NET_CONNSTATE_OFFLINE; if(CtrlMsg == NET_CTRLMSG_CONNECT) { // send response and init connection diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp index 9453bbfc5..c0e298978 100644 --- a/src/engine/shared/network_server.cpp +++ b/src/engine/shared/network_server.cpp @@ -139,7 +139,7 @@ int CNetServer::Recv(CNetChunk *pChunk) // check if we already got this client for(int i = 0; i < MaxClients(); i++) { - if(m_aSlots[i].m_Connection.State() != NET_CONNSTATE_OFFLINE && + if(m_aSlots[i].m_Connection.State() != NET_CONNSTATE_OFFLINE && m_aSlots[i].m_Connection.State() != NET_CONNSTATE_ERROR && net_addr_comp(m_aSlots[i].m_Connection.PeerAddress(), &Addr) == 0) { Found = true; // silent ignore.. we got this client already