18 files changed, 15 insertions, 66 deletions

diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp
index 63c8abbbad..6a16552b3c 100644
--- a/core/io/http_client.cpp
+++ b/core/io/http_client.cpp
@@ -29,14 +29,9 @@
 #include "http_client.h"
 #include "io/stream_peer_ssl.h"
 
-void HTTPClient::set_ip_type(IP::Type p_type) {
-	ip_type = p_type;
-}
-
 Error HTTPClient::connect_to_host(const String &p_host, int p_port, bool p_ssl,bool p_verify_host){
 
 	close();
-	tcp_connection->set_ip_type(ip_type);
 	conn_port=p_port;
 	conn_host=p_host;
 
@@ -66,7 +61,7 @@ Error HTTPClient::connect_to_host(const String &p_host, int p_port, bool p_ssl,b
 		status=STATUS_CONNECTING;
 	} else {
 		//is hostname
-		resolving=IP::get_singleton()->resolve_hostname_queue_item(conn_host, ip_type);
+		resolving=IP::get_singleton()->resolve_hostname_queue_item(conn_host);
 		status=STATUS_RESOLVING;
 
 	}
@@ -639,7 +634,6 @@ Error HTTPClient::_get_http_data(uint8_t* p_buffer, int p_bytes,int &r_received)
 
 void HTTPClient::_bind_methods() {
 
-	ClassDB::bind_method(_MD("set_ip_type","ip_type"),&HTTPClient::set_ip_type);
 	ClassDB::bind_method(_MD("connect_to_host:Error","host","port","use_ssl","verify_host"),&HTTPClient::connect_to_host,DEFVAL(false),DEFVAL(true));
 	ClassDB::bind_method(_MD("set_connection","connection:StreamPeer"),&HTTPClient::set_connection);
 	ClassDB::bind_method(_MD("get_connection:StreamPeer"),&HTTPClient::get_connection);
@@ -766,7 +760,6 @@ String HTTPClient::query_string_from_dict(const Dictionary& p_dict) {
 
 HTTPClient::HTTPClient(){
 
-	ip_type = IP::TYPE_ANY;
 	tcp_connection = StreamPeerTCP::create_ref();
 	resolving = IP::RESOLVER_INVALID_ID;
 	status=STATUS_DISCONNECTED;
diff --git a/core/io/http_client.h b/core/io/http_client.h
index 496d22530b..4b0c1b730f 100644
--- a/core/io/http_client.h
+++ b/core/io/http_client.h
@@ -132,7 +132,6 @@ public:
 
 private:
 
-	IP::Type ip_type;
 	Status status;
 	IP::ResolverID resolving;
 	int conn_port;
@@ -165,7 +164,6 @@ private:
 public:
 
 
-	void set_ip_type(IP::Type p_type);
 	//Error connect_and_get(const String& p_url,bool p_verify_host=true); //connects to a full url and perform request
 	Error connect_to_host(const String &p_host,int p_port,bool p_ssl=false,bool p_verify_host=true);
 
diff --git a/core/io/packet_peer_udp.cpp b/core/io/packet_peer_udp.cpp
index 3ea5e878f6..769a513bb3 100644
--- a/core/io/packet_peer_udp.cpp
+++ b/core/io/packet_peer_udp.cpp
@@ -42,7 +42,7 @@ Error PacketPeerUDP::_set_dest_address(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);
+		ip=IP::get_singleton()->resolve_hostname(p_address);
 		if (!ip.is_valid())
 			return ERR_CANT_RESOLVE;
 	}
@@ -51,14 +51,8 @@ Error PacketPeerUDP::_set_dest_address(const String& p_address, int p_port) {
 	return OK;
 }
 
-void PacketPeerUDP::set_ip_type(IP::Type p_type) {
-	close();
-	ip_type = p_type;
-}
-
 void PacketPeerUDP::_bind_methods() {
 
-	ClassDB::bind_method(_MD("set_ip_type","ip_type"),&PacketPeerUDP::set_ip_type);
 	ClassDB::bind_method(_MD("listen:Error","port", "bind_address", "recv_buf_size"),&PacketPeerUDP::listen,DEFVAL("*"),DEFVAL(65536));
 	ClassDB::bind_method(_MD("close"),&PacketPeerUDP::close);
 	ClassDB::bind_method(_MD("wait:Error"),&PacketPeerUDP::wait);
@@ -87,5 +81,5 @@ PacketPeerUDP* PacketPeerUDP::create() {
 
 PacketPeerUDP::PacketPeerUDP()
 {
-	ip_type = IP::TYPE_ANY;
+
 }
diff --git a/core/io/packet_peer_udp.h b/core/io/packet_peer_udp.h
index e0e560de1e..726406887c 100644
--- a/core/io/packet_peer_udp.h
+++ b/core/io/packet_peer_udp.h
@@ -38,8 +38,6 @@ class PacketPeerUDP : public PacketPeer {
 
 protected:
 
-	IP::Type ip_type;
-
 	static PacketPeerUDP* (*_create)();
 	static void _bind_methods();
 
@@ -49,7 +47,6 @@ protected:
 
 public:
 
-	virtual void set_ip_type(IP::Type p_type);
 	virtual Error listen(int p_port, IP_Address p_bind_address=IP_Address("*"), int p_recv_buffer_size=65536)=0;
 	virtual void close()=0;
 	virtual Error wait()=0;
diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp
index 1cf7842af7..96594ef65a 100644
--- a/core/io/stream_peer_tcp.cpp
+++ b/core/io/stream_peer_tcp.cpp
@@ -36,7 +36,7 @@ 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);
+		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() {
diff --git a/core/io/stream_peer_tcp.h b/core/io/stream_peer_tcp.h
index 2b25f31739..4401378743 100644
--- a/core/io/stream_peer_tcp.h
+++ b/core/io/stream_peer_tcp.h
@@ -51,15 +51,12 @@ public:
 
 protected:
 
-	IP::Type ip_type;
-
 	virtual Error _connect(const String& p_address, int p_port);
 	static StreamPeerTCP* (*_create)();
 	static void _bind_methods();
 
 public:
 
-	virtual void set_ip_type(IP::Type p_type);
 	virtual Error connect_to_host(const IP_Address& p_host, uint16_t p_port)=0;
 
 	//read/write from streampeer
diff --git a/core/io/tcp_server.cpp b/core/io/tcp_server.cpp
index b8a783152a..cb82b3fc55 100644
--- a/core/io/tcp_server.cpp
+++ b/core/io/tcp_server.cpp
@@ -44,14 +44,8 @@ TCP_Server* TCP_Server::create() {
 	return _create();
 }
 
-void TCP_Server::set_ip_type(IP::Type p_type) {
-	stop();
-	ip_type = p_type;
-}
-
 void TCP_Server::_bind_methods() {
 
-	ClassDB::bind_method(_MD("set_ip_type","ip_type"),&TCP_Server::set_ip_type);
 	ClassDB::bind_method(_MD("listen","port","bind_address"),&TCP_Server::listen,DEFVAL("*"));
 	ClassDB::bind_method(_MD("is_connection_available"),&TCP_Server::is_connection_available);
 	ClassDB::bind_method(_MD("take_connection"),&TCP_Server::take_connection);
@@ -62,5 +56,5 @@ void TCP_Server::_bind_methods() {
 
 TCP_Server::TCP_Server()
 {
-	ip_type = IP::TYPE_ANY;
+
 }
diff --git a/core/io/tcp_server.h b/core/io/tcp_server.h
index cf9a1e4a93..3cbd8c58cf 100644
--- a/core/io/tcp_server.h
+++ b/core/io/tcp_server.h
@@ -38,15 +38,12 @@ class TCP_Server : public Reference {
 	GDCLASS( TCP_Server, Reference );
 protected:
 
-	IP::Type ip_type;
-
 	static TCP_Server* (*_create)();
 
 	//bind helper
 	static void _bind_methods();
 public:
 
-	virtual void set_ip_type(IP::Type p_type);
 	virtual Error listen(uint16_t p_port, const IP_Address p_bind_address=IP_Address("*"))=0;
 	virtual bool is_connection_available() const=0;
 	virtual Ref<StreamPeerTCP> take_connection()=0;
diff --git a/drivers/unix/packet_peer_udp_posix.cpp b/drivers/unix/packet_peer_udp_posix.cpp
index 15c3b7dfe9..fdd1164fbe 100644
--- a/drivers/unix/packet_peer_udp_posix.cpp
+++ b/drivers/unix/packet_peer_udp_posix.cpp
@@ -129,7 +129,7 @@ Error PacketPeerUDPPosix::listen(int p_port, IP_Address p_bind_address, int p_re
 	ERR_FAIL_COND_V(sockfd!=-1,ERR_ALREADY_IN_USE);
 	ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(),ERR_INVALID_PARAMETER);
 
-	sock_type = ip_type;
+	sock_type = IP::TYPE_ANY;
 
 	if(p_bind_address.is_valid())
 		sock_type = p_bind_address.is_ipv4() ? IP::TYPE_IPV4 : IP::TYPE_IPV6;
@@ -271,7 +271,6 @@ PacketPeerUDPPosix::PacketPeerUDPPosix() {
 	queue_count=0;
 	peer_port=0;
 	sock_type = IP::TYPE_NONE;
-	ip_type = IP::TYPE_ANY;
 }
 
 PacketPeerUDPPosix::~PacketPeerUDPPosix() {
diff --git a/drivers/unix/stream_peer_tcp_posix.cpp b/drivers/unix/stream_peer_tcp_posix.cpp
index 96258e63f6..3e514db245 100644
--- a/drivers/unix/stream_peer_tcp_posix.cpp
+++ b/drivers/unix/stream_peer_tcp_posix.cpp
@@ -122,10 +122,9 @@ Error StreamPeerTCPPosix::_poll_connection(bool p_block) const {
 	return OK;
 };
 
-void StreamPeerTCPPosix::set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_ip_type) {
+void StreamPeerTCPPosix::set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_sock_type) {
 
-	ip_type = p_ip_type;
-	sock_type = p_ip_type;
+	sock_type = p_sock_type;
 	sockfd = p_sockfd;
 #ifndef NO_FCNTL
 	fcntl(sockfd, F_SETFL, O_NONBLOCK);
@@ -398,7 +397,6 @@ StreamPeerTCPPosix::StreamPeerTCPPosix() {
 	sockfd = -1;
 	status = STATUS_NONE;
 	peer_port = 0;
-	ip_type = IP::TYPE_ANY;
 };
 
 StreamPeerTCPPosix::~StreamPeerTCPPosix() {
diff --git a/drivers/unix/stream_peer_tcp_posix.h b/drivers/unix/stream_peer_tcp_posix.h
index d33883b159..0eaa7dff3e 100644
--- a/drivers/unix/stream_peer_tcp_posix.h
+++ b/drivers/unix/stream_peer_tcp_posix.h
@@ -68,7 +68,7 @@ public:
 
 	virtual int get_available_bytes() const;
 
-	void set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_ip_type);
+	void set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_sock_type);
 
 	virtual IP_Address get_connected_host() const;
 	virtual uint16_t get_connected_port() const;
diff --git a/drivers/unix/tcp_server_posix.cpp b/drivers/unix/tcp_server_posix.cpp
index 5f3c46451a..24de7a68b1 100644
--- a/drivers/unix/tcp_server_posix.cpp
+++ b/drivers/unix/tcp_server_posix.cpp
@@ -74,7 +74,7 @@ Error TCPServerPosix::listen(uint16_t p_port,const IP_Address p_bind_address) {
 	ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER);
 
 	int sockfd;
-	sock_type = ip_type;
+	sock_type = IP::TYPE_ANY;
 
 	// If the bind address is valid use its type as the socket type
 	if (p_bind_address.is_valid())
@@ -184,7 +184,6 @@ void TCPServerPosix::stop() {
 TCPServerPosix::TCPServerPosix() {
 
 	listen_sockfd = -1;
-	ip_type = IP::TYPE_ANY;
 	sock_type = IP::TYPE_NONE;
 };
 
diff --git a/platform/windows/packet_peer_udp_winsock.cpp b/platform/windows/packet_peer_udp_winsock.cpp
index 9759f15195..ddcfa9cdf8 100644
--- a/platform/windows/packet_peer_udp_winsock.cpp
+++ b/platform/windows/packet_peer_udp_winsock.cpp
@@ -124,7 +124,7 @@ Error PacketPeerUDPWinsock::listen(int p_port, IP_Address p_bind_address, int p_
 	ERR_FAIL_COND_V(sockfd!=-1,ERR_ALREADY_IN_USE);
 	ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(),ERR_INVALID_PARAMETER);
 
-	sock_type = ip_type;
+	sock_type = IP::TYPE_ANY;
 
 	if(p_bind_address.is_valid())
 		sock_type = p_bind_address.is_ipv4() ? IP::TYPE_IPV4 : IP::TYPE_IPV6;
@@ -289,7 +289,6 @@ PacketPeerUDPWinsock::PacketPeerUDPWinsock() {
 	packet_port=0;
 	queue_count=0;
 	peer_port=0;
-	ip_type = IP::TYPE_ANY;
 	sock_type = IP::TYPE_NONE;
 }
 
diff --git a/platform/windows/stream_peer_winsock.cpp b/platform/windows/stream_peer_winsock.cpp
index 6edd9c62fe..69a6fc177a 100644
--- a/platform/windows/stream_peer_winsock.cpp
+++ b/platform/windows/stream_peer_winsock.cpp
@@ -287,11 +287,10 @@ void StreamPeerWinsock::disconnect_from_host() {
 	peer_port = 0;
 };
 
-void StreamPeerWinsock::set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_ip_type) {
+void StreamPeerWinsock::set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_sock_type) {
 
-	ip_type = p_ip_type;
 	sockfd = p_sockfd;
-	sock_type = p_ip_type;
+	sock_type = p_sock_type;
 	status = STATUS_CONNECTING;
 	peer_host = p_host;
 	peer_port = p_port;
@@ -369,7 +368,6 @@ StreamPeerWinsock::StreamPeerWinsock() {
 	sockfd = INVALID_SOCKET;
 	status = STATUS_NONE;
 	peer_port = 0;
-	ip_type = IP::TYPE_ANY;
 };
 
 StreamPeerWinsock::~StreamPeerWinsock() {
diff --git a/platform/windows/stream_peer_winsock.h b/platform/windows/stream_peer_winsock.h
index 59e4dc0d09..780f45f47c 100644
--- a/platform/windows/stream_peer_winsock.h
+++ b/platform/windows/stream_peer_winsock.h
@@ -69,7 +69,7 @@ public:
 
 	virtual int get_available_bytes() const;
 
-	void set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_ip_type);
+	void set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_sock_type);
 
 	virtual IP_Address get_connected_host() const;
 	virtual uint16_t get_connected_port() const;
diff --git a/platform/windows/tcp_server_winsock.cpp b/platform/windows/tcp_server_winsock.cpp
index c29645cef7..883741b115 100644
--- a/platform/windows/tcp_server_winsock.cpp
+++ b/platform/windows/tcp_server_winsock.cpp
@@ -69,7 +69,7 @@ Error TCPServerWinsock::listen(uint16_t p_port,const IP_Address p_bind_address)
 	ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER);
 
 	int sockfd;
-	sock_type = ip_type;
+	sock_type = IP::TYPE_ANY;
 
 	// If the bind address is valid use its type as the socket type
 	if (p_bind_address.is_valid())
@@ -179,7 +179,6 @@ void TCPServerWinsock::stop() {
 TCPServerWinsock::TCPServerWinsock() {
 
 	listen_sockfd = INVALID_SOCKET;
-	ip_type = IP::TYPE_ANY;
 	sock_type = IP::TYPE_NONE;
 };
 
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp
index 63a81a139d..436bf3e972 100644
--- a/scene/main/http_request.cpp
+++ b/scene/main/http_request.cpp
@@ -28,10 +28,6 @@
 /*************************************************************************/
 #include "http_request.h"
 
-void HTTPRequest::set_ip_type(IP::Type p_type) {
-	client->set_ip_type(p_type);
-}
-
 void HTTPRequest::_redirect_request(const String& p_new_url) {
 
 
@@ -539,7 +535,6 @@ int HTTPRequest::get_body_size() const{
 
 void HTTPRequest::_bind_methods() {
 
-	ClassDB::bind_method(_MD("set_ip_type","ip_type"),&HTTPRequest::set_ip_type);
 	ClassDB::bind_method(_MD("request","url","custom_headers","ssl_validate_domain","method","request_data"),&HTTPRequest::request,DEFVAL(PoolStringArray()),DEFVAL(true),DEFVAL(HTTPClient::METHOD_GET),DEFVAL(String()));
 	ClassDB::bind_method(_MD("cancel_request"),&HTTPRequest::cancel_request);
 
diff --git a/scene/main/http_request.h b/scene/main/http_request.h
index 51c5ddeb69..a9c495fd81 100644
--- a/scene/main/http_request.h
+++ b/scene/main/http_request.h
@@ -116,7 +116,6 @@ protected:
 	static void _bind_methods();
 public:
 
-	void set_ip_type(IP::Type p_type);
 	Error request(const String& p_url, const Vector<String>& p_custom_headers=Vector<String>(), bool p_ssl_validate_domain=true, HTTPClient::Method p_method=HTTPClient::METHOD_GET, const String& p_request_data=""); //connects to a full url and perform request
 	void cancel_request();
 	HTTPClient::Status get_http_client_status() const;