diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-28 12:54:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 12:54:20 +0200 |
| commit | a5e44cd262e656b85e916ab2e316dd3b82bdf70d (patch) | |
| tree | 148d85b02595d2a1273b6c1669f6d8af0d83d111 | |
| parent | 0dd162a936b558d2f231143164c734aeb6b72a10 (diff) | |
| parent | 97757cd1d1b6b3702a47c6f28c200010cee335e4 (diff) | |
Merge pull request #21526 from Faless/tcp_ip_fixes
Fix DNS resolution when cache is invalid.
| -rw-r--r-- | core/io/ip.cpp | 4 | ||||
| -rw-r--r-- | core/io/stream_peer_tcp.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/io/ip.cpp b/core/io/ip.cpp index 66bd96df4f..82c94ca0b2 100644 --- a/core/io/ip.cpp +++ b/core/io/ip.cpp @@ -117,7 +117,7 @@ IP_Address IP::resolve_hostname(const String &p_hostname, IP::Type p_type) { resolver->mutex->lock(); String key = _IP_ResolverPrivate::get_cache_key(p_hostname, p_type); - if (resolver->cache.has(key)) { + if (resolver->cache.has(key) && resolver->cache[key].is_valid()) { IP_Address res = resolver->cache[key]; resolver->mutex->unlock(); return res; @@ -144,7 +144,7 @@ IP::ResolverID IP::resolve_hostname_queue_item(const String &p_hostname, IP::Typ String key = _IP_ResolverPrivate::get_cache_key(p_hostname, p_type); resolver->queue[id].hostname = p_hostname; resolver->queue[id].type = p_type; - if (resolver->cache.has(key)) { + if (resolver->cache.has(key) && resolver->cache[key].is_valid()) { resolver->queue[id].response = resolver->cache[key]; resolver->queue[id].status = IP::RESOLVER_STATUS_DONE; } else { diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp index 5d008904ff..54ebb3ae0d 100644 --- a/core/io/stream_peer_tcp.cpp +++ b/core/io/stream_peer_tcp.cpp @@ -43,8 +43,7 @@ Error StreamPeerTCP::_connect(const String &p_address, int p_port) { return ERR_CANT_RESOLVE; } - connect_to_host(ip, p_port); - return OK; + return connect_to_host(ip, p_port); } void StreamPeerTCP::_bind_methods() { |