diff options
| author | Rémi Verschelde | 2017-03-23 08:29:08 +0100 |
|---|---|---|
| committer | GitHub | 2017-03-23 08:29:08 +0100 |
| commit | aaf4e3ab9f8ffca22b34b63aaaf8cc87ead22e48 (patch) | |
| tree | ed6abd04f1d1ef9bf3bfb92761ed8a58b137a476 /core/io/stream_peer_tcp.cpp | |
| parent | a14ad02d155da315b247c03337d98e151b504c61 (diff) | |
| parent | 15ecdb5f00da2f19974d70ddd8f2658d9f2f4903 (diff) | |
| download | godot-aaf4e3ab9f8ffca22b34b63aaaf8cc87ead22e48.tar.gz godot-aaf4e3ab9f8ffca22b34b63aaaf8cc87ead22e48.tar.zst godot-aaf4e3ab9f8ffca22b34b63aaaf8cc87ead22e48.zip | |
Merge pull request #8108 from Faless/2.1-v6fix-cherry
Cherry pick #7510 and #7581 to 2.1
Diffstat (limited to '')
| -rw-r--r-- | core/io/stream_peer_tcp.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp index 753d66734..032f58a4c 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(); - ip_type = p_type; -} - void StreamPeerTCP::_bind_methods() { - ObjectTypeDB::bind_method(_MD("set_ip_type", "ip_type"), &StreamPeerTCP::set_ip_type); ObjectTypeDB::bind_method(_MD("connect", "host", "port"), &StreamPeerTCP::_connect); ObjectTypeDB::bind_method(_MD("is_connected"), &StreamPeerTCP::is_connected); ObjectTypeDB::bind_method(_MD("get_status"), &StreamPeerTCP::get_status); @@ -81,8 +75,6 @@ StreamPeerTCP *StreamPeerTCP::create() { } StreamPeerTCP::StreamPeerTCP() { - - ip_type = IP::TYPE_ANY; } StreamPeerTCP::~StreamPeerTCP(){ |