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

Fix intercept callback for IPv6

Browse Source
This commit is contained in:
Benau
2020-01-24 10:26:44 +08:00
parent 8d94f973cc
commit 58a2010d0f
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,8 +355,18 @@ int ConnectToServer::interceptCallback(ENetHost* host, ENetEvent* event)
TransportAddress server_addr = host->receivedAddress;
if (server_addr != m_server_address)
{
std::string new_address = server_addr.toString();
if (isIPv6Socket())
{
// It was already mapped to real IPv6 before the intercept
// callback
ENetAddress en_addr = server_addr.toEnetAddress();
new_address = "[";
new_address += getIPV6ReadableFromMappedAddress
(&en_addr) + "]:" + StringUtils::toString(en_addr.port);
}
Log::info("ConnectToServer", "Using new server address %s",
server_addr.toString().c_str());
new_address.c_str());
m_retry_count = 15;
m_server_address = server_addr;
m_done_intecept = true;
@@ -385,7 +395,6 @@ bool ConnectToServer::tryConnect(int timeout, int retry, bool another_port,
m_done_intecept = false;
nw->getENetHost()->intercept = ConnectToServer::interceptCallback;
std::string connecting_address = m_server_address.toString();
if (ipv6)
{
struct addrinfo hints;
@@ -414,10 +423,8 @@ bool ConnectToServer::tryConnect(int timeout, int retry, bool another_port,
{
struct sockaddr_in6* ipv6_sock =
(struct sockaddr_in6*)addr->ai_addr;
ENetAddress addr = m_server_address.toEnetAddress();
connecting_address = std::string("[") + addr_string + "]:" +
StringUtils::toString(addr.port);
addMappedAddress(&addr, ipv6_sock);
ENetAddress en_addr = m_server_address.toEnetAddress();
addMappedAddress(&en_addr, ipv6_sock);
break;
}
}
@@ -426,6 +433,14 @@ bool ConnectToServer::tryConnect(int timeout, int retry, bool another_port,
while (--m_retry_count >= 0 && !ProtocolManager::lock()->isExiting())
{
std::string connecting_address = m_server_address.toString();
if (ipv6)
{
ENetAddress en_addr = m_server_address.toEnetAddress();
connecting_address = "[";
connecting_address += getIPV6ReadableFromMappedAddress
(&en_addr) + "]:" + StringUtils::toString(en_addr.port);
}
ENetPeer* p = nw->connectTo(m_server_address);
if (!p)
break;

18
src/network/stk_host.cpp
View File

@@ -933,17 +933,17 @@ void STKHost::mainLoop()
}
} // if discovery host
if (isIPv6Socket() &&
last_disconnect_time_update < StkTime::getMonoTimeMs())
{
// Check per 20 second, client needs to be handled too in case
// the address changed in intercept callback
// (see ConnectToServer::interceptCallback)
last_disconnect_time_update = StkTime::getMonoTimeMs() + 20000;
removeDisconnectedMappedAddress();
}
if (is_server)
{
if (isIPv6Socket() &&
last_disconnect_time_update < StkTime::getMonoTimeMs())
{
// Check per 20 second, don't need to check client because it
// only has 1 peer
last_disconnect_time_update = StkTime::getMonoTimeMs() + 20000;
removeDisconnectedMappedAddress();
}
std::unique_lock<std::mutex> peer_lock(m_peers_mutex);
const float timeout = ServerConfig::m_validation_timeout;
bool need_ping = false;