diff options
| author | Fabio Alessandrelli | 2016-12-20 15:13:16 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli | 2017-03-22 15:40:31 +0100 |
| commit | ccf37c4ca2aabb212ef82bee7162401280f59e4d (patch) | |
| tree | 32ac59112a34f5b0b14f51854fb081d335c4e73f /platform | |
| parent | a14ad02d155da315b247c03337d98e151b504c61 (diff) | |
| download | godot-ccf37c4ca2aabb212ef82bee7162401280f59e4d.tar.gz godot-ccf37c4ca2aabb212ef82bee7162401280f59e4d.tar.zst godot-ccf37c4ca2aabb212ef82bee7162401280f59e4d.zip | |
TCP connect always opens correct socket type
TCP client connections does not need to rely on ipv6 dual stack sockets
(cherry picked from commit 55b4f3686d8f51958132a1a1745cc4e128fd118d)
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/stream_peer_winsock.cpp | 10 | ||||
| -rw-r--r-- | platform/windows/stream_peer_winsock.h | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/platform/windows/stream_peer_winsock.cpp b/platform/windows/stream_peer_winsock.cpp index c16fa73bd..99ee5ef47 100644 --- a/platform/windows/stream_peer_winsock.cpp +++ b/platform/windows/stream_peer_winsock.cpp @@ -87,7 +87,7 @@ Error StreamPeerWinsock::_poll_connection(bool p_block) const { }; struct sockaddr_storage their_addr; - size_t addr_size = _set_sockaddr(&their_addr, peer_host, peer_port, ip_type); + size_t addr_size = _set_sockaddr(&their_addr, peer_host, peer_port, sock_type); if (::connect(sockfd, (struct sockaddr *)&their_addr, addr_size) == SOCKET_ERROR) { @@ -277,6 +277,7 @@ void StreamPeerWinsock::disconnect() { if (sockfd != INVALID_SOCKET) closesocket(sockfd); sockfd = INVALID_SOCKET; + sock_type = IP::TYPE_NONE; status = STATUS_NONE; @@ -288,6 +289,7 @@ void StreamPeerWinsock::set_socket(int p_sockfd, IP_Address p_host, int p_port, ip_type = p_ip_type; sockfd = p_sockfd; + sock_type = p_ip_type; status = STATUS_CONNECTING; peer_host = p_host; peer_port = p_port; @@ -297,7 +299,8 @@ Error StreamPeerWinsock::connect(const IP_Address &p_host, uint16_t p_port) { ERR_FAIL_COND_V(p_host == IP_Address(), ERR_INVALID_PARAMETER); - sockfd = _socket_create(ip_type, SOCK_STREAM, IPPROTO_TCP); + sock_type = p_host.is_ipv4() ? IP::TYPE_IPV4 : IP::TYPE_IPV6; + sockfd = _socket_create(sock_type, SOCK_STREAM, IPPROTO_TCP); if (sockfd == INVALID_SOCKET) { ERR_PRINT("Socket creation failed!"); disconnect(); @@ -313,7 +316,7 @@ Error StreamPeerWinsock::connect(const IP_Address &p_host, uint16_t p_port) { }; struct sockaddr_storage their_addr; - size_t addr_size = _set_sockaddr(&their_addr, p_host, p_port, ip_type); + size_t addr_size = _set_sockaddr(&their_addr, p_host, p_port, sock_type); if (::connect(sockfd, (struct sockaddr *)&their_addr, addr_size) == SOCKET_ERROR) { @@ -359,6 +362,7 @@ uint16_t StreamPeerWinsock::get_connected_port() const { StreamPeerWinsock::StreamPeerWinsock() { + sock_type = IP::TYPE_NONE; sockfd = INVALID_SOCKET; status = STATUS_NONE; peer_port = 0; diff --git a/platform/windows/stream_peer_winsock.h b/platform/windows/stream_peer_winsock.h index de5faf981..7bea3c564 100644 --- a/platform/windows/stream_peer_winsock.h +++ b/platform/windows/stream_peer_winsock.h @@ -40,6 +40,7 @@ class StreamPeerWinsock : public StreamPeerTCP { protected: mutable Status status; + IP::Type sock_type; int sockfd; |