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

Adjust direct and formal connection timeout

Browse Source
This commit is contained in:
Benau 2018-03-26 14:15:05 +08:00
parent b5ff84bd46
commit a685d5c212
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,7 @@ void ConnectToServer::asynchronousUpdate()
m_current_protocol = hide_address;
return;
}
if (m_tried_connection++ > 10)
if (m_tried_connection++ > 7)
{
Log::warn("ConnectToServer", "Timeout waiting for"
" aloha, trying to connect anyway.");
@ -212,7 +212,7 @@ void ConnectToServer::asynchronousUpdate()
STKHost::get()->startListening();
Log::info("ConnectToServer", "Trying to connect to %s",
m_server_address.toString().c_str());
if (m_tried_connection++ > 3)
if (m_tried_connection++ > 1)
{
Log::error("ConnectToServer", "Timeout connect to %s",
m_server_address.toString().c_str());
@ -294,7 +294,10 @@ void ConnectToServer::update(int ticks)
// ----------------------------------------------------------------------------
bool ConnectToServer::handleDirectConnect()
{
if (UserConfigParams::m_random_ports && NetworkConfig::get()->isWAN() &&
// Direct connection to server should only possbile if public and private
// ports of server are the same
if (NetworkConfig::get()->isWAN() &&
m_server->getPrivatePort() == m_server->getAddress().getPort() &&
!STKHost::get()->isClientServer())
{
ENetEvent event;
@ -308,7 +311,7 @@ bool ConnectToServer::handleDirectConnect()
ENetPeer* p = dc->connectTo(m_server_address);
if (p)
{
while (enet_host_service(dc->getENetHost(), &event, 1500) != 0)
while (enet_host_service(dc->getENetHost(), &event, 2000) != 0)
{
if (event.type == ENET_EVENT_TYPE_CONNECT)
{

2
src/network/stk_peer.hpp
View File

@ -120,6 +120,8 @@ public:
/** Returns the host id of this peer. */
uint32_t getHostId() const { return m_host_id; }
// ------------------------------------------------------------------------
float getConnectedTime() const { return m_connected_time; }
// ------------------------------------------------------------------------
uint32_t getPing() const;
}; // STKPeer