ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only trying to connect without aloha for WAN only

Browse Source 
So the checking of lan direct socket handling in stk host will have
effect
This commit is contained in:
Benau 2018-03-29 12:56:01 +08:00
parent 1b0bf98766
commit b1ad185d50
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/protocols/connect_to_server.cpp
View File

@ -168,12 +168,17 @@ void ConnectToServer::asynchronousUpdate()
}
if (m_tried_connection++ > 7)
{
Log::warn("ConnectToServer", "Timeout waiting for"
" aloha, trying to connect anyway.");
m_state = CONNECTING;
// Reset timer for next usage
m_timer = 0.0;
m_tried_connection = 0;
if (NetworkConfig::get()->isWAN())
{
Log::warn("ConnectToServer", "Timeout waiting for"
" aloha, trying to connect anyway.");
m_state = CONNECTING;
// Reset timer for next usage
m_timer = 0.0;
m_tried_connection = 0;
}
else
m_state = DONE;
return;
}
if ((!NetworkConfig::m_disable_lan &&