summaryrefslogtreecommitdiffstats
path: root/core/io/stream_peer_tcp.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-02-12 23:31:40 +0100
committerGitHub <noreply@github.com>2017-02-12 23:31:40 +0100
commit70b9aa379d99c78f6db87344e3002808dac70bfa (patch)
tree4f83bb38a0fe8b636640cb9b4eb0cd0b82a0b9c6 /core/io/stream_peer_tcp.cpp
parent117a83fcb916cb02777dea73fb642216fd2e1d79 (diff)
parent5dc7c920bf1c4bb160d39e13ad6136d80badd7ae (diff)
downloadredot-engine-70b9aa379d99c78f6db87344e3002808dac70bfa.tar.gz
Merge pull request #7581 from Faless/v6_wild_bind
TCP/UDP listen bind to address and bugfixes
Diffstat (limited to 'core/io/stream_peer_tcp.cpp')
-rw-r--r--core/io/stream_peer_tcp.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp
index 0a59c32995..96594ef65a 100644
--- a/core/io/stream_peer_tcp.cpp
+++ b/core/io/stream_peer_tcp.cpp
@@ -36,8 +36,8 @@ Error StreamPeerTCP::_connect(const String& p_address,int p_port) {
if (p_address.is_valid_ip_address()) {
ip=p_address;
} else {
- ip=IP::get_singleton()->resolve_hostname(p_address, ip_type);
- if (ip==IP_Address())
+ ip=IP::get_singleton()->resolve_hostname(p_address);
+ if (!ip.is_valid())
return ERR_CANT_RESOLVE;
}
@@ -45,14 +45,8 @@ Error StreamPeerTCP::_connect(const String& p_address,int p_port) {
return OK;
}
-void StreamPeerTCP::set_ip_type(IP::Type p_type) {
- disconnect_from_host();
- ip_type = p_type;
-}
-
void StreamPeerTCP::_bind_methods() {
- ClassDB::bind_method(_MD("set_ip_type","ip_type"),&StreamPeerTCP::set_ip_type);
ClassDB::bind_method(_MD("connect_to_host","host","port"),&StreamPeerTCP::_connect);
ClassDB::bind_method(_MD("is_connected_to_host"),&StreamPeerTCP::is_connected_to_host);
ClassDB::bind_method(_MD("get_status"),&StreamPeerTCP::get_status);
@@ -83,7 +77,6 @@ StreamPeerTCP* StreamPeerTCP::create() {
StreamPeerTCP::StreamPeerTCP() {
- ip_type = IP::TYPE_ANY;
}
StreamPeerTCP::~StreamPeerTCP() {