mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
Sergey Abramchuk
e2ad2ab5d5
git-subtree-dir: Sources/OpenVPNAdapter/Libraries/Vendors/openvpn git-subtree-split: 554d8b88817d3a7b836e78940ed61bb11ed2bd9b
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
From 28cdfe3f923affa87420a47f8ac71e791c77bcde Mon Sep 17 00:00:00 2001
|
|
From: James Yonan <james@openvpn.net>
|
|
Date: Mon, 19 Mar 2018 11:24:10 +0800
|
|
Subject: [PATCH] Added Apple NAT64 support when both ASIO_HAS_GETADDRINFO and
|
|
ASIO_APPLE_NAT64 ar defined
|
|
|
|
* When calling getaddrinfo(), Apple recommends to set
|
|
AI_DEFAULT flags in hint.
|
|
|
|
* iOS bug workaround: sometimes iOS getaddrinfo() returns a
|
|
non-zero scope ID for non-link-local addresses.
|
|
Workaround by forcing scope ID to 0 for non-link-local
|
|
addresses.
|
|
---
|
|
asio/include/asio/detail/impl/socket_ops.ipp | 17 +++++++++++++++++
|
|
1 file changed, 17 insertions(+)
|
|
|
|
diff --git a/asio/include/asio/detail/impl/socket_ops.ipp b/asio/include/asio/detail/impl/socket_ops.ipp
|
|
index b3b1a0cf..e1a07e06 100644
|
|
--- a/asio/include/asio/detail/impl/socket_ops.ipp
|
|
+++ b/asio/include/asio/detail/impl/socket_ops.ipp
|
|
@@ -3338,6 +3338,23 @@ asio::error_code getaddrinfo(const char* host,
|
|
# endif
|
|
#elif !defined(ASIO_HAS_GETADDRINFO)
|
|
int error = getaddrinfo_emulation(host, service, &hints, result);
|
|
+ return ec = translate_addrinfo_error(error);
|
|
+#elif defined(ASIO_HAS_GETADDRINFO) && defined(ASIO_APPLE_NAT64)
|
|
+ // For NAT64 compatibility, Apple recommends to set AI_DEFAULT flags
|
|
+ addrinfo_type new_hints = hints;
|
|
+ new_hints.ai_flags |= AI_DEFAULT;
|
|
+ int error = ::getaddrinfo(host, service, &new_hints, result);
|
|
+
|
|
+ // iOS bug workaround: sometimes iOS getaddrinfo() returns a non-zero scope ID
|
|
+ // for non-link-local addresses. Workaround by forcing scope ID to 0 for
|
|
+ // non-link-local addresses.
|
|
+ if (!error && (*result)->ai_family == AF_INET6)
|
|
+ {
|
|
+ sockaddr_in6* a6 = (sockaddr_in6*)(*result)->ai_addr;
|
|
+ if (a6->sin6_scope_id && !(IN6_IS_ADDR_LINKLOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_NODELOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_LINKLOCAL(&a6->sin6_addr)))
|
|
+ a6->sin6_scope_id = 0;
|
|
+ }
|
|
+
|
|
return ec = translate_addrinfo_error(error);
|
|
#else
|
|
int error = ::getaddrinfo(host, service, &hints, result);
|
|
--
|
|
2.16.2
|
|
|