diff options
| author | Fabio Alessandrelli | 2016-12-01 05:05:44 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli | 2017-01-04 00:46:32 +0100 |
| commit | 47ae6c6507e1081e48d34c21cc3925ee3ae95a47 (patch) | |
| tree | 021459e7efed8253de6c59aa5720718cf587a622 /drivers/unix/socket_helpers.h | |
| parent | 5e79ac72b793ebde983f8c1cae58ea40c546c646 (diff) | |
| download | godot-47ae6c6507e1081e48d34c21cc3925ee3ae95a47.tar.gz godot-47ae6c6507e1081e48d34c21cc3925ee3ae95a47.tar.zst godot-47ae6c6507e1081e48d34c21cc3925ee3ae95a47.zip | |
Move V6ONLY flag selection inside helpers
(cherry picked from commit 4d90a4fcd5fcdca42df47062f94a1fa4e5635a94)
Diffstat (limited to 'drivers/unix/socket_helpers.h')
| -rw-r--r-- | drivers/unix/socket_helpers.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/unix/socket_helpers.h b/drivers/unix/socket_helpers.h index db6460791..9fc6c961a 100644 --- a/drivers/unix/socket_helpers.h +++ b/drivers/unix/socket_helpers.h @@ -74,10 +74,10 @@ static int _socket_create(IP_Address::AddrType p_type, int type, int protocol) { ERR_FAIL_COND_V( sockfd == -1, -1 ); if(family == AF_INET6) { - // Ensure IPv4 over IPv6 is enabled - int no = 0; - if(setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&no, sizeof(no)) != 0) { - WARN_PRINT("Unable to set IPv4 address mapping over IPv6"); + // Select IPv4 over IPv6 mapping + int opt = p_type != IP_Address::TYPE_ANY; + if(setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&opt, sizeof(opt)) != 0) { + WARN_PRINT("Unable to set/unset IPv4 address mapping over IPv6"); } } |