diff options
| author | Fabio Alessandrelli | 2016-10-22 07:23:07 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli | 2016-12-11 12:35:06 +0100 |
| commit | b3443fd84889ddc8e8a7d9d90a759497d1cdb776 (patch) | |
| tree | 6a2088a211562b32d8d6588471f8c255fff6b3ac /platform/windows/tcp_server_winsock.cpp | |
| parent | 5546929712bb2e410319affb6ba2813c0108ba23 (diff) | |
| download | godot-b3443fd84889ddc8e8a7d9d90a759497d1cdb776.tar.gz godot-b3443fd84889ddc8e8a7d9d90a759497d1cdb776.tar.zst godot-b3443fd84889ddc8e8a7d9d90a759497d1cdb776.zip | |
Pass correct address size (ipv4,ipv6) to socket connect, bind, sendto
The address size passed to network system calls now reflects the the actual IP type (v4 or v6).
Fix Windows and OSX ipv6 sockets
(cherry picked from commit 80e911647c5df21c5b6a06876f1d48e21cd1f5fc)
Diffstat (limited to '')
| -rw-r--r-- | platform/windows/tcp_server_winsock.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/windows/tcp_server_winsock.cpp b/platform/windows/tcp_server_winsock.cpp index 049e609d6..1aedc52bb 100644 --- a/platform/windows/tcp_server_winsock.cpp +++ b/platform/windows/tcp_server_winsock.cpp @@ -77,7 +77,7 @@ Error TCPServerWinsock::listen(uint16_t p_port, IP_Address::AddrType p_type,cons }; struct sockaddr_storage my_addr; - _set_listen_sockaddr(&my_addr, p_port, p_type, p_accepted_hosts); + size_t addr_size = _set_listen_sockaddr(&my_addr, p_port, p_type, p_accepted_hosts); int reuse=1; if(setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) < 0) { @@ -86,7 +86,7 @@ Error TCPServerWinsock::listen(uint16_t p_port, IP_Address::AddrType p_type,cons } - if (bind(sockfd, (struct sockaddr *)&my_addr, sizeof my_addr) != SOCKET_ERROR) { + if (bind(sockfd, (struct sockaddr *)&my_addr, addr_size) != SOCKET_ERROR) { if (::listen(sockfd, SOMAXCONN) == SOCKET_ERROR) { |