godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DNS resolution when cache is invalid. 

Fix StreamPeerTCP.connect_to_host return value.

(cherry picked from commit 97757cd1d1)
This commit is contained in:
Fabio Alessandrelli 2018-08-28 12:32:04 +02:00 committed by Rémi Verschelde
parent 3b89c2be89
commit 681c22375b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/ip.cpp
View File

@ -117,7 +117,7 @@ IP_Address IP::resolve_hostname(const String &p_hostname, IP::Type p_type) {
resolver->mutex->lock(); resolver->mutex->lock();
String key = _IP_ResolverPrivate::get_cache_key(p_hostname, p_type); 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]; IP_Address res = resolver->cache[key];
resolver->mutex->unlock(); resolver->mutex->unlock();
return res; 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); String key = _IP_ResolverPrivate::get_cache_key(p_hostname, p_type);
resolver->queue[id].hostname = p_hostname; resolver->queue[id].hostname = p_hostname;
resolver->queue[id].type = p_type; 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].response = resolver->cache[key];
resolver->queue[id].status = IP::RESOLVER_STATUS_DONE; resolver->queue[id].status = IP::RESOLVER_STATUS_DONE;
} else { } else {

3
core/io/stream_peer_tcp.cpp
View File

@ -43,8 +43,7 @@ Error StreamPeerTCP::_connect(const String &p_address, int p_port) {
return ERR_CANT_RESOLVE; return ERR_CANT_RESOLVE;
} }
connect_to_host(ip, p_port); return connect_to_host(ip, p_port);
return OK;
} }
void StreamPeerTCP::_bind_methods() { void StreamPeerTCP::_bind_methods() {