summaryrefslogtreecommitdiffstats
path: root/drivers/unix/socket_helpers.h
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2016-12-01 05:05:44 +0100
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2016-12-09 18:24:59 +0100
commit4d90a4fcd5fcdca42df47062f94a1fa4e5635a94 (patch)
treea6c34254184674d532ce6ec1663ac72f1278426a /drivers/unix/socket_helpers.h
parent9200da58e4c2498c833d9f2505600c7049e80940 (diff)
downloadredot-engine-4d90a4fcd5fcdca42df47062f94a1fa4e5635a94.tar.gz
Move V6ONLY flag selection inside helpers
Diffstat (limited to 'drivers/unix/socket_helpers.h')
-rw-r--r--drivers/unix/socket_helpers.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/unix/socket_helpers.h b/drivers/unix/socket_helpers.h
index a860c2f80e..aec4ec8843 100644
--- a/drivers/unix/socket_helpers.h
+++ b/drivers/unix/socket_helpers.h
@@ -78,10 +78,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");
}
}